@atlaskit/editor-plugin-extension 5.5.8 → 5.5.9

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-extension
 
+## 5.5.9
+
+### Patch Changes
+
+- [#172583](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/172583)
+  [`40f387a0c0962`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/40f387a0c0962) -
+  Clean up platform_editor_controls_patch_2
+- Updated dependencies
+
 ## 5.5.8
 
 ### Patch Changes

package/dist/cjs/pm-plugins/toolbar.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getToolbarConfig = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -14,10 +13,8 @@ var _messages = _interopRequireDefault(require("@atlaskit/editor-common/messages
 var _styles = require("@atlaskit/editor-common/styles");
 var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _contentWidthNarrow = _interopRequireDefault(require("@atlaskit/icon/core/content-width-narrow"));
 var _contentWidthWide = _interopRequireDefault(require("@atlaskit/icon/core/content-width-wide"));
-var _copy = _interopRequireDefault(require("@atlaskit/icon/core/copy"));
 var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
 var _expandHorizontal = _interopRequireDefault(require("@atlaskit/icon/core/expand-horizontal"));
 var _editEditorEdit = _interopRequireDefault(require("@atlaskit/icon/core/migration/edit--editor-edit"));
@@ -28,8 +25,6 @@ var _commands = require("../editor-commands/commands");
 var _pluginKey = require("./macro/plugin-key");
 var _pluginFactory = require("./plugin-factory");
 var _utils3 = require("./utils");
-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; }
-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; }
 // non-bodied extensions nested inside panels, blockquotes and lists do not support layouts
 var isNestedNBM = function isNestedNBM(state, selectedExtNode) {
   var _state$schema$nodes = state.schema.nodes,
@@ -301,18 +296,6 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
         };
       };
     }
-    var hoverDecorationProps = function hoverDecorationProps(nodeType, className) {
-      return {
-        onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
-        onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className),
-        onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
-        onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className)
-      };
-    };
-
-    // testId is required to show focus on trigger button on ESC key press
-    // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
-    var testId = (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_8') ? 'extension-overflow-dropdown-trigger' : undefined;
     return {
       title: 'Extension floating controls',
       // Ignored via go/ees005
@@ -324,7 +307,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
       onPositionCalculated: function onPositionCalculated(editorView, nextPos) {
         return calculateToolbarPosition(editorView, nextPos, state, extensionObj);
       },
-      items: [].concat((0, _toConsumableArray2.default)(editButtonItems), (0, _toConsumableArray2.default)(breakoutItems), (0, _toConsumableArray2.default)((0, _experiments.editorExperiment)('platform_editor_controls', 'control') || (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_2') ? [{
+      items: [].concat((0, _toConsumableArray2.default)(editButtonItems), (0, _toConsumableArray2.default)(breakoutItems), [{
         type: 'separator',
         hidden: editButtonItems.length === 0 && breakoutItems.length === 0
       }, {
@@ -359,34 +342,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
         title: formatMessage(_messages.default.remove),
         tabIndex: null,
         confirmDialog: confirmDialog
-      }] : [breakoutItems.length > 0 && {
-        type: 'separator',
-        fullHeight: true
-      }, {
-        type: 'extensions-placeholder',
-        separator: breakoutItems.length > 0 ? 'both' : 'end'
-      }, {
-        type: 'overflow-dropdown',
-        testId: testId,
-        options: [_objectSpread({
-          title: formatMessage(_messages.default.copyToClipboard),
-          onClick: function onClick() {
-            var _extensionApi$core, _extensionApi$floatin;
-            extensionApi === null || extensionApi === void 0 || (_extensionApi$core = extensionApi.core) === null || _extensionApi$core === void 0 || _extensionApi$core.actions.execute( // @ts-ignore
-            extensionApi === null || extensionApi === void 0 || (_extensionApi$floatin = extensionApi.floatingToolbar) === null || _extensionApi$floatin === void 0 ? void 0 : _extensionApi$floatin.commands.copyNode(nodeType, _analytics.INPUT_METHOD.FLOATING_TB));
-            return true;
-          },
-          icon: /*#__PURE__*/_react.default.createElement(_copy.default, {
-            label: ""
-          })
-        }, hoverDecorationProps(nodeType, _editorSharedStyles.akEditorSelectedNodeClassName)), _objectSpread({
-          title: formatMessage(_messages.default.delete),
-          onClick: (0, _commands.removeExtension)(editorAnalyticsAPI, _analytics.INPUT_METHOD.FLOATING_TB),
-          icon: /*#__PURE__*/_react.default.createElement(_delete.default, {
-            label: ""
-          })
-        }, hoverDecorationProps(nodeType))]
-      }])),
+      }]),
       scrollable: true
     };
   };

package/dist/es2019/pm-plugins/toolbar.js

@@ -5,10 +5,8 @@ import commonMessages from '@atlaskit/editor-common/messages';
 import { BODIED_EXT_MBE_MARGIN_TOP } from '@atlaskit/editor-common/styles';
 import { getChildrenInfo, getNodeName, isReferencedSource } from '@atlaskit/editor-common/utils';
 import { findParentNodeOfType, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import ContentWidthNarrowIcon from '@atlaskit/icon/core/content-width-narrow';
 import ContentWidthWideIcon from '@atlaskit/icon/core/content-width-wide';
-import CopyIcon from '@atlaskit/icon/core/copy';
 import DeleteIcon from '@atlaskit/icon/core/delete';
 import ExpandHorizontalIcon from '@atlaskit/icon/core/expand-horizontal';
 import EditIcon from '@atlaskit/icon/core/migration/edit--editor-edit';
@@ -296,16 +294,6 @@ export const getToolbarConfig = ({
       };
     };
   }
-  const hoverDecorationProps = (nodeType, className) => ({
-    onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
-    onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className),
-    onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
-    onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className)
-  });
-
-  // testId is required to show focus on trigger button on ESC key press
-  // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
-  const testId = fg('platform_editor_controls_patch_8') ? 'extension-overflow-dropdown-trigger' : undefined;
   return {
     title: 'Extension floating controls',
     // Ignored via go/ees005
@@ -313,7 +301,7 @@ export const getToolbarConfig = ({
     getDomRef: () => extensionState.element.parentElement || undefined,
     nodeType,
     onPositionCalculated: (editorView, nextPos) => calculateToolbarPosition(editorView, nextPos, state, extensionObj),
-    items: [...editButtonItems, ...breakoutItems, ...(editorExperiment('platform_editor_controls', 'control') || fg('platform_editor_controls_patch_2') ? [{
+    items: [...editButtonItems, ...breakoutItems, {
       type: 'separator',
       hidden: editButtonItems.length === 0 && breakoutItems.length === 0
     }, {
@@ -346,36 +334,7 @@ export const getToolbarConfig = ({
       title: formatMessage(commonMessages.remove),
       tabIndex: null,
       confirmDialog
-    }] : [breakoutItems.length > 0 && {
-      type: 'separator',
-      fullHeight: true
-    }, {
-      type: 'extensions-placeholder',
-      separator: breakoutItems.length > 0 ? 'both' : 'end'
-    }, {
-      type: 'overflow-dropdown',
-      testId,
-      options: [{
-        title: formatMessage(commonMessages.copyToClipboard),
-        onClick: () => {
-          var _extensionApi$core, _extensionApi$floatin;
-          extensionApi === null || extensionApi === void 0 ? void 0 : (_extensionApi$core = extensionApi.core) === null || _extensionApi$core === void 0 ? void 0 : _extensionApi$core.actions.execute( // @ts-ignore
-          extensionApi === null || extensionApi === void 0 ? void 0 : (_extensionApi$floatin = extensionApi.floatingToolbar) === null || _extensionApi$floatin === void 0 ? void 0 : _extensionApi$floatin.commands.copyNode(nodeType, INPUT_METHOD.FLOATING_TB));
-          return true;
-        },
-        icon: /*#__PURE__*/React.createElement(CopyIcon, {
-          label: ""
-        }),
-        ...hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)
-      }, {
-        title: formatMessage(commonMessages.delete),
-        onClick: removeExtension(editorAnalyticsAPI, INPUT_METHOD.FLOATING_TB),
-        icon: /*#__PURE__*/React.createElement(DeleteIcon, {
-          label: ""
-        }),
-        ...hoverDecorationProps(nodeType)
-      }]
-    }])],
+    }],
     scrollable: true
   };
 };

package/dist/esm/pm-plugins/toolbar.js

@@ -1,7 +1,4 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-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; }
-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) { _defineProperty(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; }
 import React from 'react';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from '@atlaskit/editor-common/extensions';
@@ -9,10 +6,8 @@ import commonMessages from '@atlaskit/editor-common/messages';
 import { BODIED_EXT_MBE_MARGIN_TOP } from '@atlaskit/editor-common/styles';
 import { getChildrenInfo as _getChildrenInfo, getNodeName, isReferencedSource } from '@atlaskit/editor-common/utils';
 import { findParentNodeOfType, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import ContentWidthNarrowIcon from '@atlaskit/icon/core/content-width-narrow';
 import ContentWidthWideIcon from '@atlaskit/icon/core/content-width-wide';
-import CopyIcon from '@atlaskit/icon/core/copy';
 import DeleteIcon from '@atlaskit/icon/core/delete';
 import ExpandHorizontalIcon from '@atlaskit/icon/core/expand-horizontal';
 import EditIcon from '@atlaskit/icon/core/migration/edit--editor-edit';
@@ -295,18 +290,6 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
         };
       };
     }
-    var hoverDecorationProps = function hoverDecorationProps(nodeType, className) {
-      return {
-        onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
-        onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className),
-        onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
-        onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className)
-      };
-    };
-
-    // testId is required to show focus on trigger button on ESC key press
-    // see hideOnEsc in platform/packages/editor/editor-plugin-floating-toolbar/src/ui/Dropdown.tsx
-    var testId = fg('platform_editor_controls_patch_8') ? 'extension-overflow-dropdown-trigger' : undefined;
     return {
       title: 'Extension floating controls',
       // Ignored via go/ees005
@@ -318,7 +301,7 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
       onPositionCalculated: function onPositionCalculated(editorView, nextPos) {
         return calculateToolbarPosition(editorView, nextPos, state, extensionObj);
       },
-      items: [].concat(_toConsumableArray(editButtonItems), _toConsumableArray(breakoutItems), _toConsumableArray(editorExperiment('platform_editor_controls', 'control') || fg('platform_editor_controls_patch_2') ? [{
+      items: [].concat(_toConsumableArray(editButtonItems), _toConsumableArray(breakoutItems), [{
         type: 'separator',
         hidden: editButtonItems.length === 0 && breakoutItems.length === 0
       }, {
@@ -353,34 +336,7 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
         title: formatMessage(commonMessages.remove),
         tabIndex: null,
         confirmDialog: confirmDialog
-      }] : [breakoutItems.length > 0 && {
-        type: 'separator',
-        fullHeight: true
-      }, {
-        type: 'extensions-placeholder',
-        separator: breakoutItems.length > 0 ? 'both' : 'end'
-      }, {
-        type: 'overflow-dropdown',
-        testId: testId,
-        options: [_objectSpread({
-          title: formatMessage(commonMessages.copyToClipboard),
-          onClick: function onClick() {
-            var _extensionApi$core, _extensionApi$floatin;
-            extensionApi === null || extensionApi === void 0 || (_extensionApi$core = extensionApi.core) === null || _extensionApi$core === void 0 || _extensionApi$core.actions.execute( // @ts-ignore
-            extensionApi === null || extensionApi === void 0 || (_extensionApi$floatin = extensionApi.floatingToolbar) === null || _extensionApi$floatin === void 0 ? void 0 : _extensionApi$floatin.commands.copyNode(nodeType, INPUT_METHOD.FLOATING_TB));
-            return true;
-          },
-          icon: /*#__PURE__*/React.createElement(CopyIcon, {
-            label: ""
-          })
-        }, hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)), _objectSpread({
-          title: formatMessage(commonMessages.delete),
-          onClick: removeExtension(editorAnalyticsAPI, INPUT_METHOD.FLOATING_TB),
-          icon: /*#__PURE__*/React.createElement(DeleteIcon, {
-            label: ""
-          })
-        }, hoverDecorationProps(nodeType))]
-      }])),
+      }]),
       scrollable: true
     };
   };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-extension",
-	"version": "5.5.8",
+	"version": "5.5.9",
 	"description": "editor-plugin-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -50,7 +50,7 @@
 		"@atlaskit/icon": "^27.0.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^14.8.0",
+		"@atlaskit/primitives": "^14.9.0",
 		"@atlaskit/radio": "^8.1.0",
 		"@atlaskit/section-message": "^8.2.0",
 		"@atlaskit/select": "^20.7.0",
@@ -60,9 +60,9 @@
 		"@atlaskit/textarea": "^8.0.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^7.1.0",
+		"@atlaskit/tmp-editor-statsig": "^7.2.0",
 		"@atlaskit/toggle": "^15.0.0",
-		"@atlaskit/tokens": "^5.2.0",
+		"@atlaskit/tokens": "^5.3.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -124,9 +124,6 @@
 		"platform_editor_update_extension_local_id_on_reset": {
 			"type": "boolean"
 		},
-		"platform_editor_controls_patch_2": {
-			"type": "boolean"
-		},
 		"platform_editor_controls_patch_8": {
 			"type": "boolean"
 		},