@atlaskit/editor-plugin-selection-extension 13.1.15 → 13.1.16

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.
Files changed (11) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/dist/cjs/ui/menu/SelectionExtensionDropdownItem.js +19 -41
  3. package/dist/cjs/ui/menu/SelectionExtensionNestedDropdownMenu.js +2 -3
  4. package/dist/cjs/ui/toolbar-components/register-inline-toolbar.js +1 -11
  5. package/dist/es2019/ui/menu/SelectionExtensionDropdownItem.js +19 -41
  6. package/dist/es2019/ui/menu/SelectionExtensionNestedDropdownMenu.js +2 -3
  7. package/dist/es2019/ui/toolbar-components/register-inline-toolbar.js +1 -9
  8. package/dist/esm/ui/menu/SelectionExtensionDropdownItem.js +19 -41
  9. package/dist/esm/ui/menu/SelectionExtensionNestedDropdownMenu.js +2 -3
  10. package/dist/esm/ui/toolbar-components/register-inline-toolbar.js +1 -11
  11. package/package.json +5 -11
package/CHANGELOG.md CHANGED
@@ -1,5 +1,18 @@
1
1
  # @atlaskit/editor-plugin-selection-extension
2
2
 
3
+ ## 13.1.16
4
+
5
+ ### Patch Changes
6
+
7
+ - [`9b17a2bfdbc92`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9b17a2bfdbc92) -
8
+ Cleanup feature gates `platform_editor_block_menu_v2_patch_1` and
9
+ `platform_editor_block_menu_v2_patch_2`. The patch_1 behaviour (inline toolbar uses
10
+ `InlineToolbarMenuItemComponent` and block menu is only closed when
11
+ `extensionLocation === 'block-menu'`) and patch_2 behaviour (max-width styles on block menu,
12
+ tooltip/title-wrap on nested dropdown menus, truncation tooltip on dropdown items) are now
13
+ permanent.
14
+ - Updated dependencies
15
+
3
16
  ## 13.1.15
4
17
 
5
18
  ### Patch Changes
package/dist/cjs/ui/menu/SelectionExtensionDropdownItem.js CHANGED
@@ -59,18 +59,9 @@ var SelectionExtensionDropdownItem = exports.SelectionExtensionDropdownItem = fu
59
59
  selectedNode: selectedNode,
60
60
  nodePos: nodePos
61
61
  });
62
- if ((0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_1')) {
63
- if (extensionLocation === 'block-menu') {
64
- var _api$blockControls2;
65
- api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.toggleBlockMenu({
66
- closeMenu: true
67
- })({
68
- tr: tr
69
- });
70
- }
71
- } else {
72
- var _api$blockControls3;
73
- api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.toggleBlockMenu({
62
+ if (extensionLocation === 'block-menu') {
63
+ var _api$blockControls2;
64
+ api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.toggleBlockMenu({
74
65
  closeMenu: true
75
66
  })({
76
67
  tr: tr
@@ -112,39 +103,26 @@ var SelectionExtensionDropdownItem = exports.SelectionExtensionDropdownItem = fu
112
103
  var elemBeforeIcon = iconElement && extensionLocation === 'block-menu' ? /*#__PURE__*/_react.default.createElement("span", {
113
104
  className: (0, _runtime.ax)([styles.svgOverflow])
114
105
  }, iconElement) : iconElement;
115
- if ((0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_2')) {
116
- return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
117
- content: isTruncated ? dropdownItem.label : null,
118
- position: "top"
119
- }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
120
- elemBefore: elemBeforeIcon,
121
- onClick: handleClick,
122
- isDisabled: dropdownItem.isDisabled,
123
- testId: _blockMenu.EXTENSION_MENU_ITEM_TEST_ID
124
- }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
125
- as: "span",
126
- xcss: (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_5') ? styles.contentWrapperWithJustifyContent : styles.contentWrapper,
127
- onMouseOver: handleMouseEnter
128
- }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
129
- as: "span",
130
- xcss: styles.label,
131
- ref: labelRef
132
- }, dropdownItem.label), dropdownItem.lozenge ? /*#__PURE__*/_react.default.createElement(_compiled.Box, {
133
- as: "span",
134
- xcss: styles.lozenge
135
- }, /*#__PURE__*/_react.default.createElement(_lozenge.default, {
136
- appearance: (0, _platformFeatureFlags.fg)('confluence_fronend_labels_categorization_migration') ? 'discovery' : 'new'
137
- }, dropdownItem.lozenge.label)) : undefined)));
138
- }
139
- return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
106
+ return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
107
+ content: isTruncated ? dropdownItem.label : null,
108
+ position: "top"
109
+ }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
140
110
  elemBefore: elemBeforeIcon,
141
- testId: _blockMenu.EXTENSION_MENU_ITEM_TEST_ID,
142
111
  onClick: handleClick,
143
- isDisabled: dropdownItem.isDisabled
144
- }, dropdownItem.label, dropdownItem.lozenge ? /*#__PURE__*/_react.default.createElement(_compiled.Box, {
112
+ isDisabled: dropdownItem.isDisabled,
113
+ testId: _blockMenu.EXTENSION_MENU_ITEM_TEST_ID
114
+ }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
115
+ as: "span",
116
+ xcss: (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_5') ? styles.contentWrapperWithJustifyContent : styles.contentWrapper,
117
+ onMouseOver: handleMouseEnter
118
+ }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
119
+ as: "span",
120
+ xcss: styles.label,
121
+ ref: labelRef
122
+ }, dropdownItem.label), dropdownItem.lozenge ? /*#__PURE__*/_react.default.createElement(_compiled.Box, {
145
123
  as: "span",
146
124
  xcss: styles.lozenge
147
125
  }, /*#__PURE__*/_react.default.createElement(_lozenge.default, {
148
126
  appearance: (0, _platformFeatureFlags.fg)('confluence_fronend_labels_categorization_migration') ? 'discovery' : 'new'
149
- }, dropdownItem.lozenge.label)) : undefined);
127
+ }, dropdownItem.lozenge.label)) : undefined)));
150
128
  };
package/dist/cjs/ui/menu/SelectionExtensionNestedDropdownMenu.js CHANGED
@@ -10,7 +10,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
10
10
  var _blockMenu = require("@atlaskit/editor-common/block-menu");
11
11
  var _editorToolbar = require("@atlaskit/editor-toolbar");
12
12
  var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/core/chevron-right"));
13
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
14
13
  var _SelectionExtensionComponentContext = require("../SelectionExtensionComponentContext");
15
14
  var _SelectionExtensionDropdownItem = require("./SelectionExtensionDropdownItem");
16
15
  var ChildItems = function ChildItems(_ref) {
@@ -60,8 +59,8 @@ var SelectionExtensionNestedDropdownMenu = exports.SelectionExtensionNestedDropd
60
59
  }),
61
60
  onClick: handleClick,
62
61
  dropdownTestId: "editor-selection-extension-menu",
63
- shouldTitleWrap: (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_2') ? false : undefined,
64
- tooltipContent: (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_2') ? nestedDropdownMenu.label : undefined
62
+ shouldTitleWrap: false,
63
+ tooltipContent: nestedDropdownMenu.label
65
64
  }, /*#__PURE__*/_react.default.createElement(ChildItems, {
66
65
  nestedDropdownMenu: nestedDropdownMenu
67
66
  }));
package/dist/cjs/ui/toolbar-components/register-inline-toolbar.js CHANGED
@@ -7,10 +7,8 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.registerInlineToolbar = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
  var _toolbar = require("@atlaskit/editor-common/toolbar");
10
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
11
10
  var _SelectionExtensionMenuItems = require("../menu/SelectionExtensionMenuItems");
12
11
  var _SelectionExtensionComponentContext = require("../SelectionExtensionComponentContext");
13
- var _MenuItem = require("./MenuItem");
14
12
  var _ToolbarButton = require("./ToolbarButton");
15
13
  var _ToolbarMenu = require("./ToolbarMenu");
16
14
  var EXTENSION_RANK_MULTIPLIER = 100;
@@ -114,11 +112,6 @@ var registerInlineToolbar = exports.registerInlineToolbar = function registerInl
114
112
  }]
115
113
  });
116
114
  }
117
-
118
- // Remove ExtensionMenuSectionConfiguration - only care about items
119
- var menuItems = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_1') ? [] : getMenuItems().filter(function (item) {
120
- return 'label' in item && 'icon' in item;
121
- });
122
115
  components.push({
123
116
  type: 'menu-item',
124
117
  key: key,
@@ -129,13 +122,10 @@ var registerInlineToolbar = exports.registerInlineToolbar = function registerInl
129
122
  rank: (index + 1) * EXTENSION_RANK_MULTIPLIER
130
123
  }],
131
124
  component: function component() {
132
- return (0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_1') ? /*#__PURE__*/_react.default.createElement(InlineToolbarMenuItemComponent, {
125
+ return /*#__PURE__*/_react.default.createElement(InlineToolbarMenuItemComponent, {
133
126
  api: api,
134
127
  extension: extension,
135
128
  getMenuItems: getMenuItems
136
- }) : /*#__PURE__*/_react.default.createElement(_MenuItem.MenuItem, {
137
- api: api,
138
- extensionMenuItems: menuItems
139
129
  });
140
130
  }
141
131
  });
package/dist/es2019/ui/menu/SelectionExtensionDropdownItem.js CHANGED
@@ -53,18 +53,9 @@ export const SelectionExtensionDropdownItem = ({
53
53
  selectedNode,
54
54
  nodePos
55
55
  });
56
- if (fg('platform_editor_block_menu_v2_patch_1')) {
57
- if (extensionLocation === 'block-menu') {
58
- var _api$blockControls2;
59
- api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.toggleBlockMenu({
60
- closeMenu: true
61
- })({
62
- tr
63
- });
64
- }
65
- } else {
66
- var _api$blockControls3;
67
- api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.toggleBlockMenu({
56
+ if (extensionLocation === 'block-menu') {
57
+ var _api$blockControls2;
58
+ api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.toggleBlockMenu({
68
59
  closeMenu: true
69
60
  })({
70
61
  tr
@@ -103,39 +94,26 @@ export const SelectionExtensionDropdownItem = ({
103
94
  const elemBeforeIcon = iconElement && extensionLocation === 'block-menu' ? /*#__PURE__*/React.createElement("span", {
104
95
  className: ax([styles.svgOverflow])
105
96
  }, iconElement) : iconElement;
106
- if (fg('platform_editor_block_menu_v2_patch_2')) {
107
- return /*#__PURE__*/React.createElement(ToolbarTooltip, {
108
- content: isTruncated ? dropdownItem.label : null,
109
- position: "top"
110
- }, /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
111
- elemBefore: elemBeforeIcon,
112
- onClick: handleClick,
113
- isDisabled: dropdownItem.isDisabled,
114
- testId: EXTENSION_MENU_ITEM_TEST_ID
115
- }, /*#__PURE__*/React.createElement(Box, {
116
- as: "span",
117
- xcss: fg('platform_editor_block_menu_v2_patch_5') ? styles.contentWrapperWithJustifyContent : styles.contentWrapper,
118
- onMouseOver: handleMouseEnter
119
- }, /*#__PURE__*/React.createElement(Box, {
120
- as: "span",
121
- xcss: styles.label,
122
- ref: labelRef
123
- }, dropdownItem.label), dropdownItem.lozenge ? /*#__PURE__*/React.createElement(Box, {
124
- as: "span",
125
- xcss: styles.lozenge
126
- }, /*#__PURE__*/React.createElement(Lozenge, {
127
- appearance: fg('confluence_fronend_labels_categorization_migration') ? 'discovery' : 'new'
128
- }, dropdownItem.lozenge.label)) : undefined)));
129
- }
130
- return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
97
+ return /*#__PURE__*/React.createElement(ToolbarTooltip, {
98
+ content: isTruncated ? dropdownItem.label : null,
99
+ position: "top"
100
+ }, /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
131
101
  elemBefore: elemBeforeIcon,
132
- testId: EXTENSION_MENU_ITEM_TEST_ID,
133
102
  onClick: handleClick,
134
- isDisabled: dropdownItem.isDisabled
135
- }, dropdownItem.label, dropdownItem.lozenge ? /*#__PURE__*/React.createElement(Box, {
103
+ isDisabled: dropdownItem.isDisabled,
104
+ testId: EXTENSION_MENU_ITEM_TEST_ID
105
+ }, /*#__PURE__*/React.createElement(Box, {
106
+ as: "span",
107
+ xcss: fg('platform_editor_block_menu_v2_patch_5') ? styles.contentWrapperWithJustifyContent : styles.contentWrapper,
108
+ onMouseOver: handleMouseEnter
109
+ }, /*#__PURE__*/React.createElement(Box, {
110
+ as: "span",
111
+ xcss: styles.label,
112
+ ref: labelRef
113
+ }, dropdownItem.label), dropdownItem.lozenge ? /*#__PURE__*/React.createElement(Box, {
136
114
  as: "span",
137
115
  xcss: styles.lozenge
138
116
  }, /*#__PURE__*/React.createElement(Lozenge, {
139
117
  appearance: fg('confluence_fronend_labels_categorization_migration') ? 'discovery' : 'new'
140
- }, dropdownItem.lozenge.label)) : undefined);
118
+ }, dropdownItem.lozenge.label)) : undefined)));
141
119
  };
package/dist/es2019/ui/menu/SelectionExtensionNestedDropdownMenu.js CHANGED
@@ -3,7 +3,6 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
3
3
  import { EXTENSION_MENU_ITEM_TEST_ID } from '@atlaskit/editor-common/block-menu';
4
4
  import { ToolbarDropdownItemSection, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
5
5
  import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
6
- import { fg } from '@atlaskit/platform-feature-flags';
7
6
  import { useSelectionExtensionComponentContext } from '../SelectionExtensionComponentContext';
8
7
  import { SelectionExtensionDropdownItem } from './SelectionExtensionDropdownItem';
9
8
  const ChildItems = ({
@@ -54,8 +53,8 @@ export const SelectionExtensionNestedDropdownMenu = ({
54
53
  }),
55
54
  onClick: handleClick,
56
55
  dropdownTestId: "editor-selection-extension-menu",
57
- shouldTitleWrap: fg('platform_editor_block_menu_v2_patch_2') ? false : undefined,
58
- tooltipContent: fg('platform_editor_block_menu_v2_patch_2') ? nestedDropdownMenu.label : undefined
56
+ shouldTitleWrap: false,
57
+ tooltipContent: nestedDropdownMenu.label
59
58
  }, /*#__PURE__*/React.createElement(ChildItems, {
60
59
  nestedDropdownMenu: nestedDropdownMenu
61
60
  }));
package/dist/es2019/ui/toolbar-components/register-inline-toolbar.js CHANGED
@@ -1,9 +1,7 @@
1
1
  import React from 'react';
2
2
  import { APPS_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION, useEditorToolbar } from '@atlaskit/editor-common/toolbar';
3
- import { fg } from '@atlaskit/platform-feature-flags';
4
3
  import { SelectionExtensionMenuItems } from '../menu/SelectionExtensionMenuItems';
5
4
  import { SelectionExtensionComponentContextProvider } from '../SelectionExtensionComponentContext';
6
- import { MenuItem } from './MenuItem';
7
5
  import { ToolbarButton } from './ToolbarButton';
8
6
  import { ToolbarMenu } from './ToolbarMenu';
9
7
  const EXTENSION_RANK_MULTIPLIER = 100;
@@ -114,9 +112,6 @@ export const registerInlineToolbar = ({
114
112
  }]
115
113
  });
116
114
  }
117
-
118
- // Remove ExtensionMenuSectionConfiguration - only care about items
119
- const menuItems = fg('platform_editor_block_menu_v2_patch_1') ? [] : getMenuItems().filter(item => 'label' in item && 'icon' in item);
120
115
  components.push({
121
116
  type: 'menu-item',
122
117
  key,
@@ -127,13 +122,10 @@ export const registerInlineToolbar = ({
127
122
  rank: (index + 1) * EXTENSION_RANK_MULTIPLIER
128
123
  }],
129
124
  component: () => {
130
- return fg('platform_editor_block_menu_v2_patch_1') ? /*#__PURE__*/React.createElement(InlineToolbarMenuItemComponent, {
125
+ return /*#__PURE__*/React.createElement(InlineToolbarMenuItemComponent, {
131
126
  api: api,
132
127
  extension: extension,
133
128
  getMenuItems: getMenuItems
134
- }) : /*#__PURE__*/React.createElement(MenuItem, {
135
- api: api,
136
- extensionMenuItems: menuItems
137
129
  });
138
130
  }
139
131
  });
package/dist/esm/ui/menu/SelectionExtensionDropdownItem.js CHANGED
@@ -50,18 +50,9 @@ export var SelectionExtensionDropdownItem = function SelectionExtensionDropdownI
50
50
  selectedNode: selectedNode,
51
51
  nodePos: nodePos
52
52
  });
53
- if (fg('platform_editor_block_menu_v2_patch_1')) {
54
- if (extensionLocation === 'block-menu') {
55
- var _api$blockControls2;
56
- api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.toggleBlockMenu({
57
- closeMenu: true
58
- })({
59
- tr: tr
60
- });
61
- }
62
- } else {
63
- var _api$blockControls3;
64
- api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.toggleBlockMenu({
53
+ if (extensionLocation === 'block-menu') {
54
+ var _api$blockControls2;
55
+ api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.toggleBlockMenu({
65
56
  closeMenu: true
66
57
  })({
67
58
  tr: tr
@@ -103,39 +94,26 @@ export var SelectionExtensionDropdownItem = function SelectionExtensionDropdownI
103
94
  var elemBeforeIcon = iconElement && extensionLocation === 'block-menu' ? /*#__PURE__*/React.createElement("span", {
104
95
  className: ax([styles.svgOverflow])
105
96
  }, iconElement) : iconElement;
106
- if (fg('platform_editor_block_menu_v2_patch_2')) {
107
- return /*#__PURE__*/React.createElement(ToolbarTooltip, {
108
- content: isTruncated ? dropdownItem.label : null,
109
- position: "top"
110
- }, /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
111
- elemBefore: elemBeforeIcon,
112
- onClick: handleClick,
113
- isDisabled: dropdownItem.isDisabled,
114
- testId: EXTENSION_MENU_ITEM_TEST_ID
115
- }, /*#__PURE__*/React.createElement(Box, {
116
- as: "span",
117
- xcss: fg('platform_editor_block_menu_v2_patch_5') ? styles.contentWrapperWithJustifyContent : styles.contentWrapper,
118
- onMouseOver: handleMouseEnter
119
- }, /*#__PURE__*/React.createElement(Box, {
120
- as: "span",
121
- xcss: styles.label,
122
- ref: labelRef
123
- }, dropdownItem.label), dropdownItem.lozenge ? /*#__PURE__*/React.createElement(Box, {
124
- as: "span",
125
- xcss: styles.lozenge
126
- }, /*#__PURE__*/React.createElement(Lozenge, {
127
- appearance: fg('confluence_fronend_labels_categorization_migration') ? 'discovery' : 'new'
128
- }, dropdownItem.lozenge.label)) : undefined)));
129
- }
130
- return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
97
+ return /*#__PURE__*/React.createElement(ToolbarTooltip, {
98
+ content: isTruncated ? dropdownItem.label : null,
99
+ position: "top"
100
+ }, /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
131
101
  elemBefore: elemBeforeIcon,
132
- testId: EXTENSION_MENU_ITEM_TEST_ID,
133
102
  onClick: handleClick,
134
- isDisabled: dropdownItem.isDisabled
135
- }, dropdownItem.label, dropdownItem.lozenge ? /*#__PURE__*/React.createElement(Box, {
103
+ isDisabled: dropdownItem.isDisabled,
104
+ testId: EXTENSION_MENU_ITEM_TEST_ID
105
+ }, /*#__PURE__*/React.createElement(Box, {
106
+ as: "span",
107
+ xcss: fg('platform_editor_block_menu_v2_patch_5') ? styles.contentWrapperWithJustifyContent : styles.contentWrapper,
108
+ onMouseOver: handleMouseEnter
109
+ }, /*#__PURE__*/React.createElement(Box, {
110
+ as: "span",
111
+ xcss: styles.label,
112
+ ref: labelRef
113
+ }, dropdownItem.label), dropdownItem.lozenge ? /*#__PURE__*/React.createElement(Box, {
136
114
  as: "span",
137
115
  xcss: styles.lozenge
138
116
  }, /*#__PURE__*/React.createElement(Lozenge, {
139
117
  appearance: fg('confluence_fronend_labels_categorization_migration') ? 'discovery' : 'new'
140
- }, dropdownItem.lozenge.label)) : undefined);
118
+ }, dropdownItem.lozenge.label)) : undefined)));
141
119
  };
package/dist/esm/ui/menu/SelectionExtensionNestedDropdownMenu.js CHANGED
@@ -3,7 +3,6 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
3
3
  import { EXTENSION_MENU_ITEM_TEST_ID } from '@atlaskit/editor-common/block-menu';
4
4
  import { ToolbarDropdownItemSection, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
5
5
  import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
6
- import { fg } from '@atlaskit/platform-feature-flags';
7
6
  import { useSelectionExtensionComponentContext } from '../SelectionExtensionComponentContext';
8
7
  import { SelectionExtensionDropdownItem } from './SelectionExtensionDropdownItem';
9
8
  var ChildItems = function ChildItems(_ref) {
@@ -53,8 +52,8 @@ export var SelectionExtensionNestedDropdownMenu = function SelectionExtensionNes
53
52
  }),
54
53
  onClick: handleClick,
55
54
  dropdownTestId: "editor-selection-extension-menu",
56
- shouldTitleWrap: fg('platform_editor_block_menu_v2_patch_2') ? false : undefined,
57
- tooltipContent: fg('platform_editor_block_menu_v2_patch_2') ? nestedDropdownMenu.label : undefined
55
+ shouldTitleWrap: false,
56
+ tooltipContent: nestedDropdownMenu.label
58
57
  }, /*#__PURE__*/React.createElement(ChildItems, {
59
58
  nestedDropdownMenu: nestedDropdownMenu
60
59
  }));
package/dist/esm/ui/toolbar-components/register-inline-toolbar.js CHANGED
@@ -1,9 +1,7 @@
1
1
  import React from 'react';
2
2
  import { APPS_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION, useEditorToolbar } from '@atlaskit/editor-common/toolbar';
3
- import { fg } from '@atlaskit/platform-feature-flags';
4
3
  import { SelectionExtensionMenuItems } from '../menu/SelectionExtensionMenuItems';
5
4
  import { SelectionExtensionComponentContextProvider } from '../SelectionExtensionComponentContext';
6
- import { MenuItem } from './MenuItem';
7
5
  import { ToolbarButton } from './ToolbarButton';
8
6
  import { ToolbarMenu } from './ToolbarMenu';
9
7
  var EXTENSION_RANK_MULTIPLIER = 100;
@@ -107,11 +105,6 @@ export var registerInlineToolbar = function registerInlineToolbar(_ref2) {
107
105
  }]
108
106
  });
109
107
  }
110
-
111
- // Remove ExtensionMenuSectionConfiguration - only care about items
112
- var menuItems = fg('platform_editor_block_menu_v2_patch_1') ? [] : getMenuItems().filter(function (item) {
113
- return 'label' in item && 'icon' in item;
114
- });
115
108
  components.push({
116
109
  type: 'menu-item',
117
110
  key: key,
@@ -122,13 +115,10 @@ export var registerInlineToolbar = function registerInlineToolbar(_ref2) {
122
115
  rank: (index + 1) * EXTENSION_RANK_MULTIPLIER
123
116
  }],
124
117
  component: function component() {
125
- return fg('platform_editor_block_menu_v2_patch_1') ? /*#__PURE__*/React.createElement(InlineToolbarMenuItemComponent, {
118
+ return /*#__PURE__*/React.createElement(InlineToolbarMenuItemComponent, {
126
119
  api: api,
127
120
  extension: extension,
128
121
  getMenuItems: getMenuItems
129
- }) : /*#__PURE__*/React.createElement(MenuItem, {
130
- api: api,
131
- extensionMenuItems: menuItems
132
122
  });
133
123
  }
134
124
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-selection-extension",
3
- "version": "13.1.15",
3
+ "version": "13.1.16",
4
4
  "description": "editor-plugin-selection-extension plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -42,24 +42,24 @@
42
42
  "@atlaskit/editor-plugin-editor-viewmode-effects": "^10.0.0",
43
43
  "@atlaskit/editor-plugin-primary-toolbar": "^11.0.0",
44
44
  "@atlaskit/editor-plugin-selection-toolbar": "^11.2.0",
45
- "@atlaskit/editor-plugin-toolbar": "^7.1.0",
45
+ "@atlaskit/editor-plugin-toolbar": "^7.2.0",
46
46
  "@atlaskit/editor-plugin-user-preferences": "^8.1.0",
47
47
  "@atlaskit/editor-prosemirror": "^7.3.0",
48
48
  "@atlaskit/editor-shared-styles": "^3.10.0",
49
49
  "@atlaskit/editor-tables": "^2.9.0",
50
- "@atlaskit/editor-toolbar": "^1.1.0",
50
+ "@atlaskit/editor-toolbar": "^1.2.0",
51
51
  "@atlaskit/icon": "^34.5.0",
52
52
  "@atlaskit/lozenge": "^13.8.0",
53
53
  "@atlaskit/platform-feature-flags": "^1.1.0",
54
54
  "@atlaskit/primitives": "^19.0.0",
55
- "@atlaskit/tmp-editor-statsig": "^79.0.0",
55
+ "@atlaskit/tmp-editor-statsig": "^80.0.0",
56
56
  "@atlaskit/tokens": "^13.0.0",
57
57
  "@babel/runtime": "^7.0.0",
58
58
  "lodash": "^4.17.21",
59
59
  "uuid": "^3.1.0"
60
60
  },
61
61
  "peerDependencies": {
62
- "@atlaskit/editor-common": "^114.29.0",
62
+ "@atlaskit/editor-common": "^114.30.0",
63
63
  "react": "^18.2.0",
64
64
  "react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
65
65
  },
@@ -114,12 +114,6 @@
114
114
  "platform_editor_selection_extension_improvement": {
115
115
  "type": "boolean"
116
116
  },
117
- "platform_editor_block_menu_v2_patch_1": {
118
- "type": "boolean"
119
- },
120
- "platform_editor_block_menu_v2_patch_2": {
121
- "type": "boolean"
122
- },
123
117
  "platform_editor_block_menu_v2_patch_5": {
124
118
  "type": "boolean"
125
119
  },