@atlaskit/editor-plugin-selection-extension 10.1.1 → 10.2.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-selection-extension
 
+## 10.2.0
+
+### Minor Changes
+
+- [`6e8029473620b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6e8029473620b) -
+  [EDITOR-4496] clean up experiment platform_editor_toolbar_aifc_patch_3 and remove view-mode plugin
+  dependency from loom plugin
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.1.2
+
+### Patch Changes
+
+- [`8708f328d5db6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8708f328d5db6) -
+  Clean up platform_editor_toolbar_aifc_overflow_menu_update feature gate
+- Updated dependencies
+
 ## 10.1.1
 
 ### Patch Changes

package/dist/cjs/ui/toolbar-components/ToolbarButton.js

@@ -7,27 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.ToolbarButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-/**
- * !! When removing platform_editor_toolbar_aifc_patch_3 also remove package dependency on `@atlaskit/editor-plugin-view-mode`.
- */
-var usePluginState = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(function () {
-  return (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true);
-}, function (api) {
+var usePluginState = function usePluginState(_api) {
   var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
     editorToolbarDockingPreference = _useEditorToolbar.editorToolbarDockingPreference;
   return {
     editorToolbarDockingPreference: editorToolbarDockingPreference
   };
-}, function (api) {
-  var editorToolbarDockingPreference = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'userPreferences.preferences.toolbarDockingPosition');
-  return {
-    editorToolbarDockingPreference: editorToolbarDockingPreference
-  };
-});
+};
 var ToolbarButton = exports.ToolbarButton = function ToolbarButton(_ref) {
   var api = _ref.api,
     config = _ref.config;

package/dist/cjs/ui/toolbar-components/ToolbarMenu.js

@@ -7,24 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.ToolbarMenu = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var usePluginState = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(function () {
-  return (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true);
-}, function (api) {
+var usePluginState = function usePluginState(_api) {
   var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
     editorToolbarDockingPreference = _useEditorToolbar.editorToolbarDockingPreference;
   return {
     editorToolbarDockingPreference: editorToolbarDockingPreference
   };
-}, function (api) {
-  var editorToolbarDockingPreference = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'userPreferences.preferences.toolbarDockingPosition');
-  return {
-    editorToolbarDockingPreference: editorToolbarDockingPreference
-  };
-});
+};
 var ToolbarMenu = exports.ToolbarMenu = function ToolbarMenu(_ref) {
   var api = _ref.api,
     config = _ref.config,

package/dist/cjs/ui/toolbar-components/register-inline-toolbar.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.registerInlineToolbar = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _MenuItem = require("./MenuItem");
 var _ToolbarButton = require("./ToolbarButton");
 var _ToolbarMenu = require("./ToolbarMenu");
@@ -100,7 +99,7 @@ var registerInlineToolbar = exports.registerInlineToolbar = function registerInl
       parents: [{
         type: 'menu-section',
         // if we have a custom menu, place items in there, otherwise in the overflow menu
-        key: getToolbarItem ? menuSectionKey : (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_overflow_menu_update') ? _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.key : _toolbar.SELECTION_EXTENSION_MENU_SECTION.key,
+        key: getToolbarItem ? menuSectionKey : _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.key,
         rank: (index + 1) * EXTENSION_RANK_MULTIPLIER
       }],
       component: function component() {

package/dist/cjs/ui/toolbar-components.js

@@ -8,7 +8,6 @@ exports.getToolbarComponents = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
 var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _MenuItem = require("./toolbar-components/MenuItem");
 var _registerInlineToolbar = require("./toolbar-components/register-inline-toolbar");
 var _migrateSelectionExtention = require("./utils/migrate-selection-extention");
@@ -53,45 +52,17 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
       key: _toolbar.TOOLBARS.PRIMARY_TOOLBAR,
       rank: _toolbar.TOOLBAR_RANK[_toolbar.APPS_SECTION.key]
     }]
-  }].concat((0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_overflow_menu_update') ? [] : [
-  // also register a section inside the overflow menu for extensions which only have menu items
-  {
-    type: _toolbar.SELECTION_EXTENSION_MENU_SECTION.type,
-    key: _toolbar.SELECTION_EXTENSION_MENU_SECTION.key,
-    parents: [{
-      key: _toolbar.OVERFLOW_MENU.key,
-      type: _toolbar.OVERFLOW_MENU.type,
-      rank: _toolbar.OVERFLOW_MENU_RANK[_toolbar.SELECTION_EXTENSION_MENU_SECTION.key]
-    }]
-  }]), (0, _toConsumableArray2.default)(extensionToolbarComponents), (0, _toConsumableArray2.default)(registerFirstPartyExtensions(api, firstPartyExtensions)), (0, _toConsumableArray2.default)(registerExternalExtensions(api, externalExtensions)));
+  }].concat((0, _toConsumableArray2.default)(extensionToolbarComponents), (0, _toConsumableArray2.default)(registerFirstPartyExtensions(api, firstPartyExtensions)), (0, _toConsumableArray2.default)(registerExternalExtensions(api, externalExtensions)));
 };
 var registerFirstPartyExtensions = function registerFirstPartyExtensions(api, extensions) {
   var components = [];
-  if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_overflow_menu_update')) {
-    components.push({
-      type: _toolbar.FIRST_PARTY_EXTENSIONS_MENU_ITEM.type,
-      key: _toolbar.FIRST_PARTY_EXTENSIONS_MENU_ITEM.key,
-      parents: [{
-        type: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.type,
-        key: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.key,
-        rank: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[_toolbar.FIRST_PARTY_EXTENSIONS_MENU_ITEM.key]
-      }],
-      component: function component() {
-        return /*#__PURE__*/_react.default.createElement(_MenuItem.MenuItem, {
-          api: api,
-          extensionMenuItems: extensions
-        });
-      }
-    });
-    return components;
-  }
   components.push({
-    type: 'menu-item',
-    key: 'first-party-extensions-menu-item',
+    type: _toolbar.FIRST_PARTY_EXTENSIONS_MENU_ITEM.type,
+    key: _toolbar.FIRST_PARTY_EXTENSIONS_MENU_ITEM.key,
     parents: [{
-      type: 'menu-section',
-      key: _toolbar.SELECTION_EXTENSION_MENU_SECTION.key,
-      rank: 100
+      type: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.type,
+      key: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.key,
+      rank: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[_toolbar.FIRST_PARTY_EXTENSIONS_MENU_ITEM.key]
     }],
     component: function component() {
       return /*#__PURE__*/_react.default.createElement(_MenuItem.MenuItem, {
@@ -104,31 +75,13 @@ var registerFirstPartyExtensions = function registerFirstPartyExtensions(api, ex
 };
 var registerExternalExtensions = function registerExternalExtensions(api, extensions) {
   var components = [];
-  if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_overflow_menu_update')) {
-    components.push({
-      type: _toolbar.EXTERNAL_EXTENSIONS_MENU_ITEM.type,
-      key: _toolbar.EXTERNAL_EXTENSIONS_MENU_ITEM.key,
-      parents: [{
-        type: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.type,
-        key: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.key,
-        rank: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[_toolbar.EXTERNAL_EXTENSIONS_MENU_ITEM.key]
-      }],
-      component: function component() {
-        return /*#__PURE__*/_react.default.createElement(_MenuItem.MenuItem, {
-          api: api,
-          extensionMenuItems: extensions
-        });
-      }
-    });
-    return components;
-  }
   components.push({
-    type: 'menu-item',
-    key: 'external-extensions-menu-item',
+    type: _toolbar.EXTERNAL_EXTENSIONS_MENU_ITEM.type,
+    key: _toolbar.EXTERNAL_EXTENSIONS_MENU_ITEM.key,
     parents: [{
-      type: 'menu-section',
-      key: _toolbar.SELECTION_EXTENSION_MENU_SECTION.key,
-      rank: 200
+      type: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.type,
+      key: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION.key,
+      rank: _toolbar.OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[_toolbar.EXTERNAL_EXTENSIONS_MENU_ITEM.key]
     }],
     component: function component() {
       return /*#__PURE__*/_react.default.createElement(_MenuItem.MenuItem, {

package/dist/es2019/ui/toolbar-components/ToolbarButton.js

@@ -1,25 +1,14 @@
 import React from 'react';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarTooltip, ToolbarButton as BaseToolbarButton } from '@atlaskit/editor-toolbar';
-import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-/**
- * !! When removing platform_editor_toolbar_aifc_patch_3 also remove package dependency on `@atlaskit/editor-plugin-view-mode`.
- */
-const usePluginState = conditionalHooksFactory(() => expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true), api => {
+const usePluginState = _api => {
   const {
     editorToolbarDockingPreference
   } = useEditorToolbar();
   return {
     editorToolbarDockingPreference
   };
-}, api => {
-  const editorToolbarDockingPreference = useSharedPluginStateSelector(api, 'userPreferences.preferences.toolbarDockingPosition');
-  return {
-    editorToolbarDockingPreference
-  };
-});
+};
 export const ToolbarButton = ({
   api,
   config

package/dist/es2019/ui/toolbar-components/ToolbarMenu.js

@@ -1,22 +1,14 @@
 import React from 'react';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarTooltip, ToolbarDropdownMenu } from '@atlaskit/editor-toolbar';
-import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-const usePluginState = conditionalHooksFactory(() => expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true), api => {
+const usePluginState = _api => {
   const {
     editorToolbarDockingPreference
   } = useEditorToolbar();
   return {
     editorToolbarDockingPreference
   };
-}, api => {
-  const editorToolbarDockingPreference = useSharedPluginStateSelector(api, 'userPreferences.preferences.toolbarDockingPosition');
-  return {
-    editorToolbarDockingPreference
-  };
-});
+};
 export const ToolbarMenu = ({
   api,
   config,

package/dist/es2019/ui/toolbar-components/register-inline-toolbar.js

@@ -1,6 +1,5 @@
 import React from 'react';
-import { SELECTION_EXTENSION_MENU_SECTION, APPS_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION } from '@atlaskit/editor-common/toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { APPS_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION } from '@atlaskit/editor-common/toolbar';
 import { MenuItem } from './MenuItem';
 import { ToolbarButton } from './ToolbarButton';
 import { ToolbarMenu } from './ToolbarMenu';
@@ -96,7 +95,7 @@ export const registerInlineToolbar = ({
       parents: [{
         type: 'menu-section',
         // if we have a custom menu, place items in there, otherwise in the overflow menu
-        key: getToolbarItem ? menuSectionKey : fg('platform_editor_toolbar_aifc_overflow_menu_update') ? OVERFLOW_EXTENSIONS_MENU_SECTION.key : SELECTION_EXTENSION_MENU_SECTION.key,
+        key: getToolbarItem ? menuSectionKey : OVERFLOW_EXTENSIONS_MENU_SECTION.key,
         rank: (index + 1) * EXTENSION_RANK_MULTIPLIER
       }],
       component: () => {

package/dist/es2019/ui/toolbar-components.js

@@ -1,6 +1,5 @@
 import React from 'react';
-import { APPS_SECTION, EXTERNAL_EXTENSIONS_MENU_ITEM, FIRST_PARTY_EXTENSIONS_MENU_ITEM, OVERFLOW_EXTENSIONS_MENU_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION_RANK, OVERFLOW_MENU, OVERFLOW_MENU_RANK, SELECTION_EXTENSION_MENU_SECTION, TOOLBAR_RANK, TOOLBARS } from '@atlaskit/editor-common/toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { APPS_SECTION, EXTERNAL_EXTENSIONS_MENU_ITEM, FIRST_PARTY_EXTENSIONS_MENU_ITEM, OVERFLOW_EXTENSIONS_MENU_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION_RANK, TOOLBAR_RANK, TOOLBARS } from '@atlaskit/editor-common/toolbar';
 import { MenuItem } from './toolbar-components/MenuItem';
 import { registerInlineToolbar } from './toolbar-components/register-inline-toolbar';
 import { migrateSelectionExtensionToMenuItem } from './utils/migrate-selection-extention';
@@ -36,45 +35,17 @@ export const getToolbarComponents = ({
       key: TOOLBARS.PRIMARY_TOOLBAR,
       rank: TOOLBAR_RANK[APPS_SECTION.key]
     }]
-  }, ...(fg('platform_editor_toolbar_aifc_overflow_menu_update') ? [] : [
-  // also register a section inside the overflow menu for extensions which only have menu items
-  {
-    type: SELECTION_EXTENSION_MENU_SECTION.type,
-    key: SELECTION_EXTENSION_MENU_SECTION.key,
-    parents: [{
-      key: OVERFLOW_MENU.key,
-      type: OVERFLOW_MENU.type,
-      rank: OVERFLOW_MENU_RANK[SELECTION_EXTENSION_MENU_SECTION.key]
-    }]
-  }]), ...extensionToolbarComponents, ...registerFirstPartyExtensions(api, firstPartyExtensions), ...registerExternalExtensions(api, externalExtensions)];
+  }, ...extensionToolbarComponents, ...registerFirstPartyExtensions(api, firstPartyExtensions), ...registerExternalExtensions(api, externalExtensions)];
 };
 const registerFirstPartyExtensions = (api, extensions) => {
   const components = [];
-  if (fg('platform_editor_toolbar_aifc_overflow_menu_update')) {
-    components.push({
-      type: FIRST_PARTY_EXTENSIONS_MENU_ITEM.type,
-      key: FIRST_PARTY_EXTENSIONS_MENU_ITEM.key,
-      parents: [{
-        type: OVERFLOW_EXTENSIONS_MENU_SECTION.type,
-        key: OVERFLOW_EXTENSIONS_MENU_SECTION.key,
-        rank: OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[FIRST_PARTY_EXTENSIONS_MENU_ITEM.key]
-      }],
-      component: () => {
-        return /*#__PURE__*/React.createElement(MenuItem, {
-          api: api,
-          extensionMenuItems: extensions
-        });
-      }
-    });
-    return components;
-  }
   components.push({
-    type: 'menu-item',
-    key: 'first-party-extensions-menu-item',
+    type: FIRST_PARTY_EXTENSIONS_MENU_ITEM.type,
+    key: FIRST_PARTY_EXTENSIONS_MENU_ITEM.key,
     parents: [{
-      type: 'menu-section',
-      key: SELECTION_EXTENSION_MENU_SECTION.key,
-      rank: 100
+      type: OVERFLOW_EXTENSIONS_MENU_SECTION.type,
+      key: OVERFLOW_EXTENSIONS_MENU_SECTION.key,
+      rank: OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[FIRST_PARTY_EXTENSIONS_MENU_ITEM.key]
     }],
     component: () => {
       return /*#__PURE__*/React.createElement(MenuItem, {
@@ -87,31 +58,13 @@ const registerFirstPartyExtensions = (api, extensions) => {
 };
 const registerExternalExtensions = (api, extensions) => {
   const components = [];
-  if (fg('platform_editor_toolbar_aifc_overflow_menu_update')) {
-    components.push({
-      type: EXTERNAL_EXTENSIONS_MENU_ITEM.type,
-      key: EXTERNAL_EXTENSIONS_MENU_ITEM.key,
-      parents: [{
-        type: OVERFLOW_EXTENSIONS_MENU_SECTION.type,
-        key: OVERFLOW_EXTENSIONS_MENU_SECTION.key,
-        rank: OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[EXTERNAL_EXTENSIONS_MENU_ITEM.key]
-      }],
-      component: () => {
-        return /*#__PURE__*/React.createElement(MenuItem, {
-          api: api,
-          extensionMenuItems: extensions
-        });
-      }
-    });
-    return components;
-  }
   components.push({
-    type: 'menu-item',
-    key: 'external-extensions-menu-item',
+    type: EXTERNAL_EXTENSIONS_MENU_ITEM.type,
+    key: EXTERNAL_EXTENSIONS_MENU_ITEM.key,
     parents: [{
-      type: 'menu-section',
-      key: SELECTION_EXTENSION_MENU_SECTION.key,
-      rank: 200
+      type: OVERFLOW_EXTENSIONS_MENU_SECTION.type,
+      key: OVERFLOW_EXTENSIONS_MENU_SECTION.key,
+      rank: OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[EXTERNAL_EXTENSIONS_MENU_ITEM.key]
     }],
     component: () => {
       return /*#__PURE__*/React.createElement(MenuItem, {

package/dist/esm/ui/toolbar-components/ToolbarButton.js

@@ -1,26 +1,13 @@
 import React from 'react';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarTooltip, ToolbarButton as BaseToolbarButton } from '@atlaskit/editor-toolbar';
-import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-/**
- * !! When removing platform_editor_toolbar_aifc_patch_3 also remove package dependency on `@atlaskit/editor-plugin-view-mode`.
- */
-var usePluginState = conditionalHooksFactory(function () {
-  return expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true);
-}, function (api) {
+var usePluginState = function usePluginState(_api) {
   var _useEditorToolbar = useEditorToolbar(),
     editorToolbarDockingPreference = _useEditorToolbar.editorToolbarDockingPreference;
   return {
     editorToolbarDockingPreference: editorToolbarDockingPreference
   };
-}, function (api) {
-  var editorToolbarDockingPreference = useSharedPluginStateSelector(api, 'userPreferences.preferences.toolbarDockingPosition');
-  return {
-    editorToolbarDockingPreference: editorToolbarDockingPreference
-  };
-});
+};
 export var ToolbarButton = function ToolbarButton(_ref) {
   var api = _ref.api,
     config = _ref.config;

package/dist/esm/ui/toolbar-components/ToolbarMenu.js

@@ -1,23 +1,13 @@
 import React from 'react';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarTooltip, ToolbarDropdownMenu } from '@atlaskit/editor-toolbar';
-import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-var usePluginState = conditionalHooksFactory(function () {
-  return expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true);
-}, function (api) {
+var usePluginState = function usePluginState(_api) {
   var _useEditorToolbar = useEditorToolbar(),
     editorToolbarDockingPreference = _useEditorToolbar.editorToolbarDockingPreference;
   return {
     editorToolbarDockingPreference: editorToolbarDockingPreference
   };
-}, function (api) {
-  var editorToolbarDockingPreference = useSharedPluginStateSelector(api, 'userPreferences.preferences.toolbarDockingPosition');
-  return {
-    editorToolbarDockingPreference: editorToolbarDockingPreference
-  };
-});
+};
 export var ToolbarMenu = function ToolbarMenu(_ref) {
   var api = _ref.api,
     config = _ref.config,

package/dist/esm/ui/toolbar-components/register-inline-toolbar.js

@@ -1,6 +1,5 @@
 import React from 'react';
-import { SELECTION_EXTENSION_MENU_SECTION, APPS_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION } from '@atlaskit/editor-common/toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { APPS_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION } from '@atlaskit/editor-common/toolbar';
 import { MenuItem } from './MenuItem';
 import { ToolbarButton } from './ToolbarButton';
 import { ToolbarMenu } from './ToolbarMenu';
@@ -93,7 +92,7 @@ export var registerInlineToolbar = function registerInlineToolbar(_ref) {
       parents: [{
         type: 'menu-section',
         // if we have a custom menu, place items in there, otherwise in the overflow menu
-        key: getToolbarItem ? menuSectionKey : fg('platform_editor_toolbar_aifc_overflow_menu_update') ? OVERFLOW_EXTENSIONS_MENU_SECTION.key : SELECTION_EXTENSION_MENU_SECTION.key,
+        key: getToolbarItem ? menuSectionKey : OVERFLOW_EXTENSIONS_MENU_SECTION.key,
         rank: (index + 1) * EXTENSION_RANK_MULTIPLIER
       }],
       component: function component() {

package/dist/esm/ui/toolbar-components.js

@@ -1,7 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import React from 'react';
-import { APPS_SECTION, EXTERNAL_EXTENSIONS_MENU_ITEM, FIRST_PARTY_EXTENSIONS_MENU_ITEM, OVERFLOW_EXTENSIONS_MENU_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION_RANK, OVERFLOW_MENU, OVERFLOW_MENU_RANK, SELECTION_EXTENSION_MENU_SECTION, TOOLBAR_RANK, TOOLBARS } from '@atlaskit/editor-common/toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { APPS_SECTION, EXTERNAL_EXTENSIONS_MENU_ITEM, FIRST_PARTY_EXTENSIONS_MENU_ITEM, OVERFLOW_EXTENSIONS_MENU_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION_RANK, TOOLBAR_RANK, TOOLBARS } from '@atlaskit/editor-common/toolbar';
 import { MenuItem } from './toolbar-components/MenuItem';
 import { registerInlineToolbar } from './toolbar-components/register-inline-toolbar';
 import { migrateSelectionExtensionToMenuItem } from './utils/migrate-selection-extention';
@@ -46,45 +45,17 @@ export var getToolbarComponents = function getToolbarComponents(_ref) {
       key: TOOLBARS.PRIMARY_TOOLBAR,
       rank: TOOLBAR_RANK[APPS_SECTION.key]
     }]
-  }].concat(_toConsumableArray(fg('platform_editor_toolbar_aifc_overflow_menu_update') ? [] : [
-  // also register a section inside the overflow menu for extensions which only have menu items
-  {
-    type: SELECTION_EXTENSION_MENU_SECTION.type,
-    key: SELECTION_EXTENSION_MENU_SECTION.key,
-    parents: [{
-      key: OVERFLOW_MENU.key,
-      type: OVERFLOW_MENU.type,
-      rank: OVERFLOW_MENU_RANK[SELECTION_EXTENSION_MENU_SECTION.key]
-    }]
-  }]), _toConsumableArray(extensionToolbarComponents), _toConsumableArray(registerFirstPartyExtensions(api, firstPartyExtensions)), _toConsumableArray(registerExternalExtensions(api, externalExtensions)));
+  }].concat(_toConsumableArray(extensionToolbarComponents), _toConsumableArray(registerFirstPartyExtensions(api, firstPartyExtensions)), _toConsumableArray(registerExternalExtensions(api, externalExtensions)));
 };
 var registerFirstPartyExtensions = function registerFirstPartyExtensions(api, extensions) {
   var components = [];
-  if (fg('platform_editor_toolbar_aifc_overflow_menu_update')) {
-    components.push({
-      type: FIRST_PARTY_EXTENSIONS_MENU_ITEM.type,
-      key: FIRST_PARTY_EXTENSIONS_MENU_ITEM.key,
-      parents: [{
-        type: OVERFLOW_EXTENSIONS_MENU_SECTION.type,
-        key: OVERFLOW_EXTENSIONS_MENU_SECTION.key,
-        rank: OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[FIRST_PARTY_EXTENSIONS_MENU_ITEM.key]
-      }],
-      component: function component() {
-        return /*#__PURE__*/React.createElement(MenuItem, {
-          api: api,
-          extensionMenuItems: extensions
-        });
-      }
-    });
-    return components;
-  }
   components.push({
-    type: 'menu-item',
-    key: 'first-party-extensions-menu-item',
+    type: FIRST_PARTY_EXTENSIONS_MENU_ITEM.type,
+    key: FIRST_PARTY_EXTENSIONS_MENU_ITEM.key,
     parents: [{
-      type: 'menu-section',
-      key: SELECTION_EXTENSION_MENU_SECTION.key,
-      rank: 100
+      type: OVERFLOW_EXTENSIONS_MENU_SECTION.type,
+      key: OVERFLOW_EXTENSIONS_MENU_SECTION.key,
+      rank: OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[FIRST_PARTY_EXTENSIONS_MENU_ITEM.key]
     }],
     component: function component() {
       return /*#__PURE__*/React.createElement(MenuItem, {
@@ -97,31 +68,13 @@ var registerFirstPartyExtensions = function registerFirstPartyExtensions(api, ex
 };
 var registerExternalExtensions = function registerExternalExtensions(api, extensions) {
   var components = [];
-  if (fg('platform_editor_toolbar_aifc_overflow_menu_update')) {
-    components.push({
-      type: EXTERNAL_EXTENSIONS_MENU_ITEM.type,
-      key: EXTERNAL_EXTENSIONS_MENU_ITEM.key,
-      parents: [{
-        type: OVERFLOW_EXTENSIONS_MENU_SECTION.type,
-        key: OVERFLOW_EXTENSIONS_MENU_SECTION.key,
-        rank: OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[EXTERNAL_EXTENSIONS_MENU_ITEM.key]
-      }],
-      component: function component() {
-        return /*#__PURE__*/React.createElement(MenuItem, {
-          api: api,
-          extensionMenuItems: extensions
-        });
-      }
-    });
-    return components;
-  }
   components.push({
-    type: 'menu-item',
-    key: 'external-extensions-menu-item',
+    type: EXTERNAL_EXTENSIONS_MENU_ITEM.type,
+    key: EXTERNAL_EXTENSIONS_MENU_ITEM.key,
     parents: [{
-      type: 'menu-section',
-      key: SELECTION_EXTENSION_MENU_SECTION.key,
-      rank: 200
+      type: OVERFLOW_EXTENSIONS_MENU_SECTION.type,
+      key: OVERFLOW_EXTENSIONS_MENU_SECTION.key,
+      rank: OVERFLOW_EXTENSIONS_MENU_SECTION_RANK[EXTERNAL_EXTENSIONS_MENU_ITEM.key]
     }],
     component: function component() {
       return /*#__PURE__*/React.createElement(MenuItem, {

package/dist/types/pm-plugins/main.d.ts

@@ -1,31 +1,32 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { Node } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { type SelectionExtensionPluginState } from '../types';
+import { type ExtensionMenuItemConfiguration, type SelectionExtension, type SelectionExtensionCoords, type SelectionExtensionPluginState, type SelectionExtensionSelectionInfo } from '../types';
 export declare const selectionExtensionPluginKey: PluginKey<SelectionExtensionPluginState>;
 export declare const createPlugin: () => SafePlugin<SelectionExtensionPluginState | {
     activeExtension: any;
     docChangedAfterClick?: boolean;
     nodePos?: number;
-    selectedNode?: import("prosemirror-model").Node;
+    selectedNode?: Node;
     startTrackChanges?: boolean;
 } | {
-    selectedNode: any;
-    nodePos: any;
-    startTrackChanges: boolean;
-    docChangedAfterClick: boolean;
     activeExtension?: {
-        coords: import("../types").SelectionExtensionCoords;
-        extension: import("../types").SelectionExtension | import("../types").ExtensionMenuItemConfiguration;
-        selection: import("../types").SelectionExtensionSelectionInfo;
+        coords: SelectionExtensionCoords;
+        extension: SelectionExtension | ExtensionMenuItemConfiguration;
+        selection: SelectionExtensionSelectionInfo;
     };
+    docChangedAfterClick: boolean;
+    nodePos: any;
+    selectedNode: any;
+    startTrackChanges: boolean;
 } | {
-    startTrackChanges: any;
     activeExtension?: {
-        coords: import("../types").SelectionExtensionCoords;
-        extension: import("../types").SelectionExtension | import("../types").ExtensionMenuItemConfiguration;
-        selection: import("../types").SelectionExtensionSelectionInfo;
+        coords: SelectionExtensionCoords;
+        extension: SelectionExtension | ExtensionMenuItemConfiguration;
+        selection: SelectionExtensionSelectionInfo;
     };
     docChangedAfterClick?: boolean;
     nodePos?: number;
-    selectedNode?: import("prosemirror-model").Node;
+    selectedNode?: Node;
+    startTrackChanges: any;
 }>;

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -1,31 +1,32 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { Node } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { type SelectionExtensionPluginState } from '../types';
+import { type ExtensionMenuItemConfiguration, type SelectionExtension, type SelectionExtensionCoords, type SelectionExtensionPluginState, type SelectionExtensionSelectionInfo } from '../types';
 export declare const selectionExtensionPluginKey: PluginKey<SelectionExtensionPluginState>;
 export declare const createPlugin: () => SafePlugin<SelectionExtensionPluginState | {
     activeExtension: any;
     docChangedAfterClick?: boolean;
     nodePos?: number;
-    selectedNode?: import("prosemirror-model").Node;
+    selectedNode?: Node;
     startTrackChanges?: boolean;
 } | {
-    selectedNode: any;
-    nodePos: any;
-    startTrackChanges: boolean;
-    docChangedAfterClick: boolean;
     activeExtension?: {
-        coords: import("../types").SelectionExtensionCoords;
-        extension: import("../types").SelectionExtension | import("../types").ExtensionMenuItemConfiguration;
-        selection: import("../types").SelectionExtensionSelectionInfo;
+        coords: SelectionExtensionCoords;
+        extension: SelectionExtension | ExtensionMenuItemConfiguration;
+        selection: SelectionExtensionSelectionInfo;
     };
+    docChangedAfterClick: boolean;
+    nodePos: any;
+    selectedNode: any;
+    startTrackChanges: boolean;
 } | {
-    startTrackChanges: any;
     activeExtension?: {
-        coords: import("../types").SelectionExtensionCoords;
-        extension: import("../types").SelectionExtension | import("../types").ExtensionMenuItemConfiguration;
-        selection: import("../types").SelectionExtensionSelectionInfo;
+        coords: SelectionExtensionCoords;
+        extension: SelectionExtension | ExtensionMenuItemConfiguration;
+        selection: SelectionExtensionSelectionInfo;
     };
     docChangedAfterClick?: boolean;
     nodePos?: number;
-    selectedNode?: import("prosemirror-model").Node;
+    selectedNode?: Node;
+    startTrackChanges: any;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-extension",
-	"version": "10.1.1",
+	"version": "10.2.0",
 	"description": "editor-plugin-selection-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-utils": "^19.26.0",
+		"@atlaskit/adf-utils": "^19.27.0",
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-plugin-analytics": "^7.0.0",
@@ -41,8 +41,8 @@
 		"@atlaskit/editor-plugin-editor-viewmode": "^9.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^7.0.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^8.0.0",
-		"@atlaskit/editor-plugin-selection-toolbar": "^8.0.0",
-		"@atlaskit/editor-plugin-toolbar": "^4.0.0",
+		"@atlaskit/editor-plugin-selection-toolbar": "^8.1.0",
+		"@atlaskit/editor-plugin-toolbar": "^4.1.0",
 		"@atlaskit/editor-plugin-user-preferences": "^5.0.0",
 		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
@@ -51,10 +51,9 @@
 		"@atlaskit/icon": "^29.4.0",
 		"@atlaskit/lozenge": "^13.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^17.1.0",
-		"@atlaskit/tmp-editor-statsig": "^16.23.0",
-		"@atlaskit/tokens": "^10.0.0",
+		"@atlaskit/tmp-editor-statsig": "^16.30.0",
+		"@atlaskit/tokens": "^10.1.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"react-intl-next": "npm:react-intl@^5.18.1",
@@ -116,9 +115,6 @@
 		},
 		"platform_editor_selection_extension_improvement": {
 			"type": "boolean"
-		},
-		"platform_editor_toolbar_aifc_overflow_menu_update": {
-			"type": "boolean"
 		}
 	}
 }