@atlaskit/editor-plugin-block-menu 3.2.4 → 3.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,22 @@
1
1
  # @atlaskit/editor-plugin-block-menu
2
2
 
3
+ ## 3.2.6
4
+
5
+ ### Patch Changes
6
+
7
+ - [`3c44ed6acd860`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3c44ed6acd860) -
8
+ Enable `Turn into` in block menu on all nested node under a feature gate
9
+ - Updated dependencies
10
+
11
+ ## 3.2.5
12
+
13
+ ### Patch Changes
14
+
15
+ - [`f7bc2f60e0fc6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f7bc2f60e0fc6) -
16
+ [ux] Updates copy text for drag handle, copy block, copy link and updates order of items in Turn
17
+ into menu.
18
+ - Updated dependencies
19
+
3
20
  ## 3.2.4
4
21
 
5
22
  ### Patch Changes
@@ -11,11 +11,13 @@ var _reactIntlNext = require("react-intl-next");
11
11
  var _blockMenu = require("@atlaskit/editor-common/block-menu");
12
12
  var _clipboard = require("@atlaskit/editor-common/clipboard");
13
13
  var _copyButton = require("@atlaskit/editor-common/copy-button");
14
+ var _messages = require("@atlaskit/editor-common/messages");
14
15
  var _model = require("@atlaskit/editor-prosemirror/model");
15
16
  var _state = require("@atlaskit/editor-prosemirror/state");
16
17
  var _utils = require("@atlaskit/editor-tables/utils");
17
18
  var _editorToolbar = require("@atlaskit/editor-toolbar");
18
19
  var _copy = _interopRequireDefault(require("@atlaskit/icon/core/copy"));
20
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
19
21
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
20
22
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
21
23
  var toDOMFromFragment = function toDOMFromFragment(fragment, schema) {
@@ -101,6 +103,7 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
101
103
  api === null || api === void 0 || api.core.actions.focus();
102
104
  }
103
105
  };
106
+ var text = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockMenuMessages.copyContent) : formatMessage(_blockMenu.messages.copyBlock);
104
107
  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
105
108
  elemBefore: /*#__PURE__*/_react.default.createElement(_copy.default, {
106
109
  label: ""
@@ -108,6 +111,6 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
108
111
  onClick: function onClick(e) {
109
112
  return copyHandler(e);
110
113
  }
111
- }, formatMessage(_blockMenu.messages.copyBlock));
114
+ }, text);
112
115
  };
113
116
  var _default = exports.default = (0, _reactIntlNext.injectIntl)(CopyBlockMenuItem);
@@ -48,11 +48,12 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
48
48
  if (!(0, _platformFeatureFlags.fg)('platform_editor_adf_with_localid') || checkIsNestedNode()) {
49
49
  return null;
50
50
  }
51
+ var text = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockMenuMessages.copyLinkToBlock) : formatMessage(_messages.blockMenuMessages.copyLink);
51
52
  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
52
53
  onClick: handleClick,
53
54
  elemBefore: /*#__PURE__*/_react.default.createElement(_link.default, {
54
55
  label: ""
55
56
  })
56
- }, formatMessage(_messages.blockMenuMessages.copyLink));
57
+ }, text);
57
58
  };
58
59
  var CopyLinkDropdownItem = exports.CopyLinkDropdownItem = (0, _reactIntlNext.injectIntl)(CopyLinkDropdownItemContent);
@@ -9,10 +9,12 @@ exports.DeleteDropdownItem = void 0;
9
9
  var _react = _interopRequireWildcard(require("react"));
10
10
  var _reactIntlNext = require("react-intl-next");
11
11
  var _blockMenu = require("@atlaskit/editor-common/block-menu");
12
+ var _messages = require("@atlaskit/editor-common/messages");
12
13
  var _state = require("@atlaskit/editor-prosemirror/state");
13
14
  var _utils = require("@atlaskit/editor-tables/utils");
14
15
  var _editorToolbar = require("@atlaskit/editor-toolbar");
15
16
  var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
17
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
16
18
  var _box = require("@atlaskit/primitives/box");
17
19
  var _text = _interopRequireDefault(require("@atlaskit/primitives/text"));
18
20
  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); }
@@ -66,6 +68,7 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
66
68
  var _api$decorations2, _api$decorations2$rem;
67
69
  api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$decorations2 = api.decorations) === null || _api$decorations2 === void 0 || (_api$decorations2 = _api$decorations2.commands) === null || _api$decorations2 === void 0 || (_api$decorations2$rem = _api$decorations2.removeDecoration) === null || _api$decorations2$rem === void 0 ? void 0 : _api$decorations2$rem.call(_api$decorations2));
68
70
  };
71
+ var text = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockMenuMessages.deleteBlock) : formatMessage(_blockMenu.messages.deleteBlock);
69
72
  return /*#__PURE__*/_react.default.createElement(_box.Box, {
70
73
  onMouseEnter: onMouseEnter,
71
74
  onMouseLeave: onMouseLeave
@@ -78,6 +81,6 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
78
81
  }, /*#__PURE__*/_react.default.createElement(_text.default, {
79
82
  as: "span",
80
83
  color: "color.text.danger"
81
- }, formatMessage(_blockMenu.messages.deleteBlock))));
84
+ }, text)));
82
85
  };
83
86
  var DeleteDropdownItem = exports.DeleteDropdownItem = (0, _reactIntlNext.injectIntl)(DeleteDropdownItemContent);
@@ -8,15 +8,18 @@ exports.FormatMenuComponent = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
  var _reactIntlNext = require("react-intl-next");
10
10
  var _blockMenu = require("@atlaskit/editor-common/block-menu");
11
+ var _messages = require("@atlaskit/editor-common/messages");
11
12
  var _editorToolbar = require("@atlaskit/editor-toolbar");
12
13
  var _changes = _interopRequireDefault(require("@atlaskit/icon/core/changes"));
13
14
  var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/core/chevron-right"));
15
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
14
16
  var FormatMenuComponent = exports.FormatMenuComponent = function FormatMenuComponent(_ref) {
15
17
  var children = _ref.children;
16
18
  var _useIntl = (0, _reactIntlNext.useIntl)(),
17
19
  formatMessage = _useIntl.formatMessage;
20
+ var text = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockMenuMessages.turnInto) : formatMessage(_blockMenu.messages.turnInto);
18
21
  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarNestedDropdownMenu, {
19
- text: formatMessage(_blockMenu.messages.turnInto),
22
+ text: text,
20
23
  elemBefore: /*#__PURE__*/_react.default.createElement(_changes.default, {
21
24
  label: ""
22
25
  }),
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.checkIsFormatMenuHidden = void 0;
7
7
  var _utils = require("@atlaskit/editor-prosemirror/utils");
8
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
8
9
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
9
10
  var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
10
11
  var _isNestedNode = require("./isNestedNode");
@@ -31,7 +32,7 @@ var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema, me
31
32
  }
32
33
  }
33
34
  var isNested = (0, _isNestedNode.isNestedNode)(selection, menuTriggerBy);
34
- return !content || isNested;
35
+ return !content || isNested && !(0, _platformFeatureFlags.fg)('platform_editor_block_menu_transform_nested_node');
35
36
  };
36
37
  var getIsFormatMenuHiddenEmptyLine = function getIsFormatMenuHiddenEmptyLine(selection, schema, menuTriggerBy) {
37
38
  var nodes = schema.nodes;
@@ -42,8 +43,8 @@ var getIsFormatMenuHiddenEmptyLine = function getIsFormatMenuHiddenEmptyLine(sel
42
43
  if (selection.empty || selection.content().size === 0) {
43
44
  // if empty selection, show format menu
44
45
  return false;
45
- } else if (isNested) {
46
- // if nested, always hide format menu
46
+ } else if (isNested && !(0, _platformFeatureFlags.fg)('platform_editor_block_menu_transform_nested_node')) {
47
+ // if nested, always hide format menu unless feature gate is enabled
47
48
  return true;
48
49
  } else {
49
50
  var content;
@@ -3,11 +3,13 @@ import { injectIntl, useIntl } from 'react-intl-next';
3
3
  import { messages } from '@atlaskit/editor-common/block-menu';
4
4
  import { copyHTMLToClipboard } from '@atlaskit/editor-common/clipboard';
5
5
  import { toDOM, copyDomNode } from '@atlaskit/editor-common/copy-button';
6
+ import { blockMenuMessages } from '@atlaskit/editor-common/messages';
6
7
  import { Fragment, DOMSerializer } from '@atlaskit/editor-prosemirror/model';
7
8
  import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
8
9
  import { isTableSelected } from '@atlaskit/editor-tables/utils';
9
10
  import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
10
11
  import CopyIcon from '@atlaskit/icon/core/copy';
12
+ import { fg } from '@atlaskit/platform-feature-flags';
11
13
  const toDOMFromFragment = (fragment, schema) => {
12
14
  return DOMSerializer.fromSchema(schema).serializeFragment(fragment);
13
15
  };
@@ -94,11 +96,12 @@ const CopyBlockMenuItem = ({
94
96
  api === null || api === void 0 ? void 0 : api.core.actions.focus();
95
97
  }
96
98
  };
99
+ const text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.copyContent) : formatMessage(messages.copyBlock);
97
100
  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
98
101
  elemBefore: /*#__PURE__*/React.createElement(CopyIcon, {
99
102
  label: ""
100
103
  }),
101
104
  onClick: e => copyHandler(e)
102
- }, formatMessage(messages.copyBlock));
105
+ }, text);
103
106
  };
104
107
  export default injectIntl(CopyBlockMenuItem);
@@ -42,11 +42,12 @@ const CopyLinkDropdownItemContent = ({
42
42
  if (!fg('platform_editor_adf_with_localid') || checkIsNestedNode()) {
43
43
  return null;
44
44
  }
45
+ const text = fg('platform_editor_block_menu_patch_1') ? formatMessage(messages.copyLinkToBlock) : formatMessage(messages.copyLink);
45
46
  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
46
47
  onClick: handleClick,
47
48
  elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {
48
49
  label: ""
49
50
  })
50
- }, formatMessage(messages.copyLink));
51
+ }, text);
51
52
  };
52
53
  export const CopyLinkDropdownItem = injectIntl(CopyLinkDropdownItemContent);
@@ -1,10 +1,12 @@
1
1
  import React, { useCallback } from 'react';
2
2
  import { useIntl, injectIntl } from 'react-intl-next';
3
3
  import { messages } from '@atlaskit/editor-common/block-menu';
4
+ import { blockMenuMessages } from '@atlaskit/editor-common/messages';
4
5
  import { TextSelection } from '@atlaskit/editor-prosemirror/state';
5
6
  import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
6
7
  import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
7
8
  import DeleteIcon from '@atlaskit/icon/core/delete';
9
+ import { fg } from '@atlaskit/platform-feature-flags';
8
10
  import { Box } from '@atlaskit/primitives/box';
9
11
  import Text from '@atlaskit/primitives/text';
10
12
  const DeleteDropdownItemContent = ({
@@ -61,6 +63,7 @@ const DeleteDropdownItemContent = ({
61
63
  var _api$decorations2, _api$decorations2$com, _api$decorations2$com2;
62
64
  api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$decorations2 = api.decorations) === null || _api$decorations2 === void 0 ? void 0 : (_api$decorations2$com = _api$decorations2.commands) === null || _api$decorations2$com === void 0 ? void 0 : (_api$decorations2$com2 = _api$decorations2$com.removeDecoration) === null || _api$decorations2$com2 === void 0 ? void 0 : _api$decorations2$com2.call(_api$decorations2$com));
63
65
  };
66
+ const text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.deleteBlock) : formatMessage(messages.deleteBlock);
64
67
  return /*#__PURE__*/React.createElement(Box, {
65
68
  onMouseEnter: onMouseEnter,
66
69
  onMouseLeave: onMouseLeave
@@ -73,6 +76,6 @@ const DeleteDropdownItemContent = ({
73
76
  }, /*#__PURE__*/React.createElement(Text, {
74
77
  as: "span",
75
78
  color: "color.text.danger"
76
- }, formatMessage(messages.deleteBlock))));
79
+ }, text)));
77
80
  };
78
81
  export const DeleteDropdownItem = injectIntl(DeleteDropdownItemContent);
@@ -1,17 +1,20 @@
1
1
  import React from 'react';
2
2
  import { useIntl } from 'react-intl-next';
3
3
  import { messages } from '@atlaskit/editor-common/block-menu';
4
+ import { blockMenuMessages } from '@atlaskit/editor-common/messages';
4
5
  import { ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
5
6
  import ChangesIcon from '@atlaskit/icon/core/changes';
6
7
  import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
8
+ import { fg } from '@atlaskit/platform-feature-flags';
7
9
  export const FormatMenuComponent = ({
8
10
  children
9
11
  }) => {
10
12
  const {
11
13
  formatMessage
12
14
  } = useIntl();
15
+ const text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.turnInto) : formatMessage(messages.turnInto);
13
16
  return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
14
- text: formatMessage(messages.turnInto),
17
+ text: text,
15
18
  elemBefore: /*#__PURE__*/React.createElement(ChangesIcon, {
16
19
  label: ""
17
20
  }),
@@ -1,4 +1,5 @@
1
1
  import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
2
+ import { fg } from '@atlaskit/platform-feature-flags';
2
3
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
3
4
  import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
4
5
  import { isNestedNode } from './isNestedNode';
@@ -25,7 +26,7 @@ const getIsFormatMenuHidden = (selection, schema, menuTriggerBy) => {
25
26
  }
26
27
  }
27
28
  const isNested = isNestedNode(selection, menuTriggerBy);
28
- return !content || isNested;
29
+ return !content || isNested && !fg('platform_editor_block_menu_transform_nested_node');
29
30
  };
30
31
  const getIsFormatMenuHiddenEmptyLine = (selection, schema, menuTriggerBy) => {
31
32
  const nodes = schema.nodes;
@@ -36,8 +37,8 @@ const getIsFormatMenuHiddenEmptyLine = (selection, schema, menuTriggerBy) => {
36
37
  if (selection.empty || selection.content().size === 0) {
37
38
  // if empty selection, show format menu
38
39
  return false;
39
- } else if (isNested) {
40
- // if nested, always hide format menu
40
+ } else if (isNested && !fg('platform_editor_block_menu_transform_nested_node')) {
41
+ // if nested, always hide format menu unless feature gate is enabled
41
42
  return true;
42
43
  } else {
43
44
  let content;
@@ -6,11 +6,13 @@ import { injectIntl, useIntl } from 'react-intl-next';
6
6
  import { messages } from '@atlaskit/editor-common/block-menu';
7
7
  import { copyHTMLToClipboard } from '@atlaskit/editor-common/clipboard';
8
8
  import { toDOM, copyDomNode } from '@atlaskit/editor-common/copy-button';
9
+ import { blockMenuMessages } from '@atlaskit/editor-common/messages';
9
10
  import { Fragment, DOMSerializer } from '@atlaskit/editor-prosemirror/model';
10
11
  import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
11
12
  import { isTableSelected } from '@atlaskit/editor-tables/utils';
12
13
  import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
13
14
  import CopyIcon from '@atlaskit/icon/core/copy';
15
+ import { fg } from '@atlaskit/platform-feature-flags';
14
16
  var toDOMFromFragment = function toDOMFromFragment(fragment, schema) {
15
17
  return DOMSerializer.fromSchema(schema).serializeFragment(fragment);
16
18
  };
@@ -94,6 +96,7 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
94
96
  api === null || api === void 0 || api.core.actions.focus();
95
97
  }
96
98
  };
99
+ var text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.copyContent) : formatMessage(messages.copyBlock);
97
100
  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
98
101
  elemBefore: /*#__PURE__*/React.createElement(CopyIcon, {
99
102
  label: ""
@@ -101,6 +104,6 @@ var CopyBlockMenuItem = function CopyBlockMenuItem(_ref) {
101
104
  onClick: function onClick(e) {
102
105
  return copyHandler(e);
103
106
  }
104
- }, formatMessage(messages.copyBlock));
107
+ }, text);
105
108
  };
106
109
  export default injectIntl(CopyBlockMenuItem);
@@ -39,11 +39,12 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
39
39
  if (!fg('platform_editor_adf_with_localid') || checkIsNestedNode()) {
40
40
  return null;
41
41
  }
42
+ var text = fg('platform_editor_block_menu_patch_1') ? formatMessage(messages.copyLinkToBlock) : formatMessage(messages.copyLink);
42
43
  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
43
44
  onClick: handleClick,
44
45
  elemBefore: /*#__PURE__*/React.createElement(LinkIcon, {
45
46
  label: ""
46
47
  })
47
- }, formatMessage(messages.copyLink));
48
+ }, text);
48
49
  };
49
50
  export var CopyLinkDropdownItem = injectIntl(CopyLinkDropdownItemContent);
@@ -1,10 +1,12 @@
1
1
  import React, { useCallback } from 'react';
2
2
  import { useIntl, injectIntl } from 'react-intl-next';
3
3
  import { messages } from '@atlaskit/editor-common/block-menu';
4
+ import { blockMenuMessages } from '@atlaskit/editor-common/messages';
4
5
  import { TextSelection } from '@atlaskit/editor-prosemirror/state';
5
6
  import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
6
7
  import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
7
8
  import DeleteIcon from '@atlaskit/icon/core/delete';
9
+ import { fg } from '@atlaskit/platform-feature-flags';
8
10
  import { Box } from '@atlaskit/primitives/box';
9
11
  import Text from '@atlaskit/primitives/text';
10
12
  var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
@@ -57,6 +59,7 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
57
59
  var _api$decorations2, _api$decorations2$rem;
58
60
  api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$decorations2 = api.decorations) === null || _api$decorations2 === void 0 || (_api$decorations2 = _api$decorations2.commands) === null || _api$decorations2 === void 0 || (_api$decorations2$rem = _api$decorations2.removeDecoration) === null || _api$decorations2$rem === void 0 ? void 0 : _api$decorations2$rem.call(_api$decorations2));
59
61
  };
62
+ var text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.deleteBlock) : formatMessage(messages.deleteBlock);
60
63
  return /*#__PURE__*/React.createElement(Box, {
61
64
  onMouseEnter: onMouseEnter,
62
65
  onMouseLeave: onMouseLeave
@@ -69,6 +72,6 @@ var DeleteDropdownItemContent = function DeleteDropdownItemContent(_ref) {
69
72
  }, /*#__PURE__*/React.createElement(Text, {
70
73
  as: "span",
71
74
  color: "color.text.danger"
72
- }, formatMessage(messages.deleteBlock))));
75
+ }, text)));
73
76
  };
74
77
  export var DeleteDropdownItem = injectIntl(DeleteDropdownItemContent);
@@ -1,15 +1,18 @@
1
1
  import React from 'react';
2
2
  import { useIntl } from 'react-intl-next';
3
3
  import { messages } from '@atlaskit/editor-common/block-menu';
4
+ import { blockMenuMessages } from '@atlaskit/editor-common/messages';
4
5
  import { ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
5
6
  import ChangesIcon from '@atlaskit/icon/core/changes';
6
7
  import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
8
+ import { fg } from '@atlaskit/platform-feature-flags';
7
9
  export var FormatMenuComponent = function FormatMenuComponent(_ref) {
8
10
  var children = _ref.children;
9
11
  var _useIntl = useIntl(),
10
12
  formatMessage = _useIntl.formatMessage;
13
+ var text = fg('platform_editor_block_menu_patch_1') ? formatMessage(blockMenuMessages.turnInto) : formatMessage(messages.turnInto);
11
14
  return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
12
- text: formatMessage(messages.turnInto),
15
+ text: text,
13
16
  elemBefore: /*#__PURE__*/React.createElement(ChangesIcon, {
14
17
  label: ""
15
18
  }),
@@ -1,4 +1,5 @@
1
1
  import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
2
+ import { fg } from '@atlaskit/platform-feature-flags';
2
3
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
3
4
  import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
4
5
  import { isNestedNode } from './isNestedNode';
@@ -25,7 +26,7 @@ var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema, me
25
26
  }
26
27
  }
27
28
  var isNested = isNestedNode(selection, menuTriggerBy);
28
- return !content || isNested;
29
+ return !content || isNested && !fg('platform_editor_block_menu_transform_nested_node');
29
30
  };
30
31
  var getIsFormatMenuHiddenEmptyLine = function getIsFormatMenuHiddenEmptyLine(selection, schema, menuTriggerBy) {
31
32
  var nodes = schema.nodes;
@@ -36,8 +37,8 @@ var getIsFormatMenuHiddenEmptyLine = function getIsFormatMenuHiddenEmptyLine(sel
36
37
  if (selection.empty || selection.content().size === 0) {
37
38
  // if empty selection, show format menu
38
39
  return false;
39
- } else if (isNested) {
40
- // if nested, always hide format menu
40
+ } else if (isNested && !fg('platform_editor_block_menu_transform_nested_node')) {
41
+ // if nested, always hide format menu unless feature gate is enabled
41
42
  return true;
42
43
  } else {
43
44
  var content;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-block-menu",
3
- "version": "3.2.4",
3
+ "version": "3.2.6",
4
4
  "description": "BlockMenu plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -38,16 +38,16 @@
38
38
  "@atlaskit/editor-shared-styles": "^3.6.0",
39
39
  "@atlaskit/editor-tables": "^2.9.0",
40
40
  "@atlaskit/editor-toolbar": "^0.9.0",
41
- "@atlaskit/icon": "^28.2.0",
41
+ "@atlaskit/icon": "^28.3.0",
42
42
  "@atlaskit/icon-lab": "^5.7.0",
43
43
  "@atlaskit/platform-feature-flags": "^1.1.0",
44
44
  "@atlaskit/primitives": "^14.15.0",
45
- "@atlaskit/tmp-editor-statsig": "^12.28.0",
45
+ "@atlaskit/tmp-editor-statsig": "^12.29.0",
46
46
  "@atlaskit/tokens": "^6.3.0",
47
47
  "@babel/runtime": "^7.0.0"
48
48
  },
49
49
  "peerDependencies": {
50
- "@atlaskit/editor-common": "^109.11.0",
50
+ "@atlaskit/editor-common": "^109.14.0",
51
51
  "react": "^18.2.0",
52
52
  "react-intl-next": "npm:react-intl@^5.18.1"
53
53
  },
@@ -91,8 +91,14 @@
91
91
  "platform_editor_adf_with_localid": {
92
92
  "type": "boolean"
93
93
  },
94
+ "platform_editor_block_menu_transform_nested_node": {
95
+ "type": "boolean"
96
+ },
94
97
  "platform_editor_block_menu_selection_fix": {
95
98
  "type": "boolean"
99
+ },
100
+ "platform_editor_block_menu_patch_1": {
101
+ "type": "boolean"
96
102
  }
97
103
  }
98
104
  }