@atlaskit/editor-plugin-extension 5.1.0 → 5.1.2

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,26 @@
1
1
  # @atlaskit/editor-plugin-extension
2
2
 
3
+ ## 5.1.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [#131500](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/131500)
8
+ [`0afe8d0b15393`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0afe8d0b15393) -
9
+ ENGHEALTH-23697 Iconography uplift for editor-plugin-extension
10
+ - [#135110](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/135110)
11
+ [`be99401173db3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/be99401173db3) -
12
+ [ux] Move copy and delete button out of toobar overflow menu for macro
13
+ - Updated dependencies
14
+
15
+ ## 5.1.1
16
+
17
+ ### Patch Changes
18
+
19
+ - [#134468](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/134468)
20
+ [`e312ec529d05a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e312ec529d05a) -
21
+ [ux] Apply hover decoration when hovering on copy/delete button on overflow menu
22
+ - Updated dependencies
23
+
3
24
  ## 5.1.0
4
25
 
5
26
  ### Minor Changes
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
7
  exports.getToolbarConfig = void 0;
8
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
8
9
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
9
10
  var _react = _interopRequireDefault(require("react"));
10
11
  var _extensions = require("@atlaskit/editor-common/extensions");
@@ -12,17 +13,13 @@ var _messages = _interopRequireDefault(require("@atlaskit/editor-common/messages
12
13
  var _styles = require("@atlaskit/editor-common/styles");
13
14
  var _utils = require("@atlaskit/editor-common/utils");
14
15
  var _utils2 = require("@atlaskit/editor-prosemirror/utils");
16
+ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
15
17
  var _contentWidthNarrow = _interopRequireDefault(require("@atlaskit/icon/core/content-width-narrow"));
16
18
  var _contentWidthWide = _interopRequireDefault(require("@atlaskit/icon/core/content-width-wide"));
17
19
  var _copy = _interopRequireDefault(require("@atlaskit/icon/core/copy"));
18
20
  var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
19
- var _edit = _interopRequireDefault(require("@atlaskit/icon/core/edit"));
20
21
  var _expandHorizontal = _interopRequireDefault(require("@atlaskit/icon/core/expand-horizontal"));
21
- var _edit2 = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/edit"));
22
- var _mediaCenter = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/media-center"));
23
- var _mediaFullWidth = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/media-full-width"));
24
- var _mediaWide = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/media-wide"));
25
- var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove"));
22
+ var _editEditorEdit = _interopRequireDefault(require("@atlaskit/icon/core/migration/edit--editor-edit"));
26
23
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
27
24
  var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
28
25
  var _actions = require("../editor-actions/actions");
@@ -30,6 +27,8 @@ var _commands = require("../editor-commands/commands");
30
27
  var _pluginKey = require("./macro/plugin-key");
31
28
  var _pluginFactory = require("./plugin-factory");
32
29
  var _utils3 = require("./utils");
30
+ 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; }
31
+ 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; }
33
32
  // non-bodied extensions nested inside panels, blockquotes and lists do not support layouts
34
33
  var isNestedNBM = function isNestedNBM(state, selectedExtNode) {
35
34
  var _state$schema$nodes = state.schema.nodes,
@@ -74,24 +73,39 @@ var breakoutButtonListOptions = function breakoutButtonListOptions(state, format
74
73
  var layout = nodeWithPos.node.attrs.layout;
75
74
  return [{
76
75
  type: 'button',
77
- icon: _contentWidthNarrow.default,
78
- iconFallback: _mediaCenter.default,
76
+ icon: function icon() {
77
+ return /*#__PURE__*/_react.default.createElement(_contentWidthNarrow.default, {
78
+ label: formatMessage(_messages.default.layoutFixedWidth),
79
+ spacing: "spacious"
80
+ });
81
+ },
82
+ iconFallback: _contentWidthNarrow.default,
79
83
  onClick: (0, _commands.updateExtensionLayout)('default', editorAnalyticsAPI),
80
84
  selected: layout === 'default',
81
85
  title: formatMessage(_messages.default.layoutFixedWidth),
82
86
  tabIndex: null
83
87
  }, {
84
88
  type: 'button',
85
- icon: _contentWidthWide.default,
86
- iconFallback: _mediaWide.default,
89
+ icon: function icon() {
90
+ return /*#__PURE__*/_react.default.createElement(_contentWidthWide.default, {
91
+ label: formatMessage(_messages.default.layoutWide),
92
+ spacing: "spacious"
93
+ });
94
+ },
95
+ iconFallback: _contentWidthWide.default,
87
96
  onClick: (0, _commands.updateExtensionLayout)('wide', editorAnalyticsAPI),
88
97
  selected: layout === 'wide',
89
98
  title: formatMessage(_messages.default.layoutWide),
90
99
  tabIndex: null
91
100
  }, {
92
101
  type: 'button',
93
- icon: _expandHorizontal.default,
94
- iconFallback: _mediaFullWidth.default,
102
+ icon: function icon() {
103
+ return /*#__PURE__*/_react.default.createElement(_expandHorizontal.default, {
104
+ label: formatMessage(_messages.default.layoutFullWidth),
105
+ spacing: "spacious"
106
+ });
107
+ },
108
+ iconFallback: _expandHorizontal.default,
95
109
  onClick: (0, _commands.updateExtensionLayout)('full-width', editorAnalyticsAPI),
96
110
  selected: layout === 'full-width',
97
111
  title: formatMessage(_messages.default.layoutFullWidth),
@@ -181,8 +195,8 @@ var editButton = function editButton(formatMessage, extensionState, applyChangeT
181
195
  var editButtonItems = [{
182
196
  id: 'editor.extension.edit',
183
197
  type: 'button',
184
- icon: _edit.default,
185
- iconFallback: _edit2.default,
198
+ icon: _editEditorEdit.default,
199
+ iconFallback: _editEditorEdit.default,
186
200
  testId: 'extension-toolbar-edit-button',
187
201
  // Taking the latest `updateExtension` from plugin state to avoid race condition @see ED-8501
188
202
  onClick: function onClick(state, dispatch, view) {
@@ -254,7 +268,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
254
268
  editorAnalyticsAPI = _ref.editorAnalyticsAPI,
255
269
  extensionApi = _ref.extensionApi;
256
270
  return function (state, intl) {
257
- var _hoverDecoration, _hoverDecoration2, _hoverDecoration3, _hoverDecoration4;
271
+ var _hoverDecoration5, _hoverDecoration6, _hoverDecoration7, _hoverDecoration8;
258
272
  var formatMessage = intl.formatMessage;
259
273
  var extensionState = (0, _pluginFactory.getPluginState)(state);
260
274
  if ((0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro')) {
@@ -295,6 +309,15 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
295
309
  };
296
310
  };
297
311
  }
312
+ var hoverDecorationProps = function hoverDecorationProps(nodeType, className) {
313
+ var _hoverDecoration, _hoverDecoration2, _hoverDecoration3, _hoverDecoration4;
314
+ return (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_1') ? {
315
+ onMouseEnter: (_hoverDecoration = hoverDecoration) === null || _hoverDecoration === void 0 ? void 0 : _hoverDecoration(nodeType, true, className),
316
+ onMouseLeave: (_hoverDecoration2 = hoverDecoration) === null || _hoverDecoration2 === void 0 ? void 0 : _hoverDecoration2(nodeType, false, className),
317
+ onFocus: (_hoverDecoration3 = hoverDecoration) === null || _hoverDecoration3 === void 0 ? void 0 : _hoverDecoration3(nodeType, true, className),
318
+ onBlur: (_hoverDecoration4 = hoverDecoration) === null || _hoverDecoration4 === void 0 ? void 0 : _hoverDecoration4(nodeType, false, className)
319
+ } : undefined;
320
+ };
298
321
  return {
299
322
  title: 'Extension floating controls',
300
323
  // Ignored via go/ees005
@@ -306,7 +329,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
306
329
  onPositionCalculated: function onPositionCalculated(editorView, nextPos) {
307
330
  return calculateToolbarPosition(editorView, nextPos, state, extensionObj);
308
331
  },
309
- items: [].concat((0, _toConsumableArray2.default)(editButtonItems), (0, _toConsumableArray2.default)(breakoutItems), (0, _toConsumableArray2.default)((0, _experiments.editorExperiment)('platform_editor_controls', 'control') ? [{
332
+ 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') ? [{
310
333
  type: 'separator',
311
334
  hidden: editButtonItems.length === 0 && breakoutItems.length === 0
312
335
  }, {
@@ -324,14 +347,19 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
324
347
  }, {
325
348
  id: 'editor.extension.delete',
326
349
  type: 'button',
327
- icon: _delete.default,
328
- iconFallback: _remove.default,
350
+ icon: function icon() {
351
+ return /*#__PURE__*/_react.default.createElement(_delete.default, {
352
+ label: formatMessage(_messages.default.remove),
353
+ spacing: "spacious"
354
+ });
355
+ },
356
+ iconFallback: _delete.default,
329
357
  appearance: 'danger',
330
358
  onClick: (0, _commands.removeExtension)(editorAnalyticsAPI),
331
- onMouseEnter: (_hoverDecoration = hoverDecoration) === null || _hoverDecoration === void 0 ? void 0 : _hoverDecoration(nodeType, true),
332
- onMouseLeave: (_hoverDecoration2 = hoverDecoration) === null || _hoverDecoration2 === void 0 ? void 0 : _hoverDecoration2(nodeType, false),
333
- onFocus: (_hoverDecoration3 = hoverDecoration) === null || _hoverDecoration3 === void 0 ? void 0 : _hoverDecoration3(nodeType, true),
334
- onBlur: (_hoverDecoration4 = hoverDecoration) === null || _hoverDecoration4 === void 0 ? void 0 : _hoverDecoration4(nodeType, false),
359
+ onMouseEnter: (_hoverDecoration5 = hoverDecoration) === null || _hoverDecoration5 === void 0 ? void 0 : _hoverDecoration5(nodeType, true),
360
+ onMouseLeave: (_hoverDecoration6 = hoverDecoration) === null || _hoverDecoration6 === void 0 ? void 0 : _hoverDecoration6(nodeType, false),
361
+ onFocus: (_hoverDecoration7 = hoverDecoration) === null || _hoverDecoration7 === void 0 ? void 0 : _hoverDecoration7(nodeType, true),
362
+ onBlur: (_hoverDecoration8 = hoverDecoration) === null || _hoverDecoration8 === void 0 ? void 0 : _hoverDecoration8(nodeType, false),
335
363
  focusEditoronEnter: true,
336
364
  title: formatMessage(_messages.default.remove),
337
365
  tabIndex: null,
@@ -344,7 +372,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
344
372
  separator: breakoutItems.length > 0 ? 'both' : 'end'
345
373
  }, {
346
374
  type: 'overflow-dropdown',
347
- options: [{
375
+ options: [_objectSpread({
348
376
  title: 'Copy',
349
377
  onClick: function onClick() {
350
378
  var _extensionApi$core, _extensionApi$floatin;
@@ -355,13 +383,13 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
355
383
  icon: /*#__PURE__*/_react.default.createElement(_copy.default, {
356
384
  label: "Copy"
357
385
  })
358
- }, {
386
+ }, hoverDecorationProps(nodeType, _editorSharedStyles.akEditorSelectedNodeClassName)), _objectSpread({
359
387
  title: 'Delete',
360
388
  onClick: (0, _commands.removeExtension)(editorAnalyticsAPI),
361
389
  icon: /*#__PURE__*/_react.default.createElement(_delete.default, {
362
390
  label: "Delete"
363
391
  })
364
- }]
392
+ }, hoverDecorationProps(nodeType))]
365
393
  }])),
366
394
  scrollable: true
367
395
  };
@@ -12,8 +12,8 @@ var _react2 = require("@emotion/react");
12
12
  var _reactIntlNext = require("react-intl-next");
13
13
  var _new = require("@atlaskit/button/new");
14
14
  var _extensions = require("@atlaskit/editor-common/extensions");
15
- var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
16
- var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-right"));
15
+ var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/chevron-down"));
16
+ var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/utility/chevron-right"));
17
17
  var _colors = require("@atlaskit/theme/colors");
18
18
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
19
19
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -21,7 +21,7 @@ var _reactIntlNext = require("react-intl-next");
21
21
  var _new = _interopRequireDefault(require("@atlaskit/button/new"));
22
22
  var _extensions = require("@atlaskit/editor-common/extensions");
23
23
  var _heading = _interopRequireDefault(require("@atlaskit/heading"));
24
- var _addCircle = _interopRequireDefault(require("@atlaskit/icon/glyph/add-circle"));
24
+ var _addAddCircle = _interopRequireDefault(require("@atlaskit/icon/core/migration/add--add-circle"));
25
25
  var _primitives = require("@atlaskit/primitives");
26
26
  var _sectionMessage = _interopRequireDefault(require("@atlaskit/section-message"));
27
27
  var _select = _interopRequireDefault(require("@atlaskit/select"));
@@ -204,11 +204,12 @@ var FieldsetField = /*#__PURE__*/function (_React$Component) {
204
204
  testId: "add-more",
205
205
  appearance: "subtle",
206
206
  iconBefore: function iconBefore(iconProps) {
207
- return (0, _react2.jsx)(_addCircle.default
207
+ return (0, _react2.jsx)(_addAddCircle.default
208
208
  // Ignored via go/ees005
209
209
  // eslint-disable-next-line react/jsx-props-no-spreading
210
210
  , (0, _extends2.default)({}, iconProps, {
211
- size: "small",
211
+ LEGACY_size: "small",
212
+ spacing: "none",
212
213
  label: intl.formatMessage(_extensions.configPanelMessages.addField)
213
214
  }));
214
215
  },
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
9
9
  var _react2 = require("@emotion/react");
10
10
  var _reactIntlNext = require("react-intl-next");
11
11
  var _extensions = require("@atlaskit/editor-common/extensions");
12
- var _crossCircle = _interopRequireDefault(require("@atlaskit/icon/glyph/cross-circle"));
12
+ var _crossCircle = _interopRequireDefault(require("@atlaskit/icon/core/migration/cross-circle"));
13
13
  var _colors = require("@atlaskit/theme/colors");
14
14
  var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
15
15
  /**
@@ -63,7 +63,8 @@ var RemovableField = function RemovableField(_ref) {
63
63
  content: intl.formatMessage(_extensions.configPanelMessages.removeField),
64
64
  position: "left"
65
65
  }, (0, _react2.jsx)(_crossCircle.default, {
66
- size: "small",
66
+ LEGACY_size: "small",
67
+ spacing: "none",
67
68
  label: intl.formatMessage(_extensions.configPanelMessages.removeField)
68
69
  }))));
69
70
  };
@@ -10,7 +10,7 @@ var _react = require("react");
10
10
  var _react2 = require("@emotion/react");
11
11
  var _reactIntlNext = require("react-intl-next");
12
12
  var _extensions = require("@atlaskit/editor-common/extensions");
13
- var _checkCircle = _interopRequireDefault(require("@atlaskit/icon/glyph/check-circle"));
13
+ var _successCheckCircle = _interopRequireDefault(require("@atlaskit/icon/core/migration/success--check-circle"));
14
14
  var _primitives = require("@atlaskit/primitives");
15
15
  var _colors = require("@atlaskit/theme/colors");
16
16
  /**
@@ -75,10 +75,11 @@ var SaveIndicator = exports.SaveIndicator = function SaveIndicator(_ref) {
75
75
  }, (0, _react2.jsx)("div", {
76
76
  css: saveIndicatorContentStyles,
77
77
  "data-testid": "save-indicator-content"
78
- }, (0, _react2.jsx)(_checkCircle.default, {
78
+ }, (0, _react2.jsx)(_successCheckCircle.default, {
79
79
  label: "Saving",
80
- primaryColor: "var(--ds-icon-success, ".concat(_colors.G300, ")"),
81
- size: "small"
80
+ color: "var(--ds-icon-success, ".concat(_colors.G300, ")"),
81
+ LEGACY_size: "small",
82
+ spacing: "none"
82
83
  }), (0, _react2.jsx)(_primitives.Box, {
83
84
  xcss: saveIndicatorTextStyles
84
85
  }, (0, _react2.jsx)(_primitives.Text, null, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
@@ -4,17 +4,13 @@ import commonMessages from '@atlaskit/editor-common/messages';
4
4
  import { BODIED_EXT_MBE_MARGIN_TOP } from '@atlaskit/editor-common/styles';
5
5
  import { getChildrenInfo, getNodeName, isReferencedSource } from '@atlaskit/editor-common/utils';
6
6
  import { findParentNodeOfType, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
7
+ import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
7
8
  import ContentWidthNarrowIcon from '@atlaskit/icon/core/content-width-narrow';
8
9
  import ContentWidthWideIcon from '@atlaskit/icon/core/content-width-wide';
9
10
  import CopyIcon from '@atlaskit/icon/core/copy';
10
11
  import DeleteIcon from '@atlaskit/icon/core/delete';
11
- import EditIcon from '@atlaskit/icon/core/edit';
12
12
  import ExpandHorizontalIcon from '@atlaskit/icon/core/expand-horizontal';
13
- import LegacyEditIcon from '@atlaskit/icon/glyph/editor/edit';
14
- import CenterIcon from '@atlaskit/icon/glyph/editor/media-center';
15
- import FullWidthIcon from '@atlaskit/icon/glyph/editor/media-full-width';
16
- import WideIcon from '@atlaskit/icon/glyph/editor/media-wide';
17
- import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
13
+ import EditIcon from '@atlaskit/icon/core/migration/edit--editor-edit';
18
14
  import { fg } from '@atlaskit/platform-feature-flags';
19
15
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
20
16
  import { editExtension } from '../editor-actions/actions';
@@ -22,6 +18,7 @@ import { removeDescendantNodes, removeExtension, updateExtensionLayout } from '.
22
18
  import { pluginKey as macroPluginKey } from './macro/plugin-key';
23
19
  import { getPluginState } from './plugin-factory';
24
20
  import { getSelectedExtension } from './utils';
21
+
25
22
  // non-bodied extensions nested inside panels, blockquotes and lists do not support layouts
26
23
  const isNestedNBM = (state, selectedExtNode) => {
27
24
  const {
@@ -78,24 +75,33 @@ const breakoutButtonListOptions = (state, formatMessage, extensionState, breakou
78
75
  } = nodeWithPos.node.attrs;
79
76
  return [{
80
77
  type: 'button',
81
- icon: ContentWidthNarrowIcon,
82
- iconFallback: CenterIcon,
78
+ icon: () => /*#__PURE__*/React.createElement(ContentWidthNarrowIcon, {
79
+ label: formatMessage(commonMessages.layoutFixedWidth),
80
+ spacing: "spacious"
81
+ }),
82
+ iconFallback: ContentWidthNarrowIcon,
83
83
  onClick: updateExtensionLayout('default', editorAnalyticsAPI),
84
84
  selected: layout === 'default',
85
85
  title: formatMessage(commonMessages.layoutFixedWidth),
86
86
  tabIndex: null
87
87
  }, {
88
88
  type: 'button',
89
- icon: ContentWidthWideIcon,
90
- iconFallback: WideIcon,
89
+ icon: () => /*#__PURE__*/React.createElement(ContentWidthWideIcon, {
90
+ label: formatMessage(commonMessages.layoutWide),
91
+ spacing: "spacious"
92
+ }),
93
+ iconFallback: ContentWidthWideIcon,
91
94
  onClick: updateExtensionLayout('wide', editorAnalyticsAPI),
92
95
  selected: layout === 'wide',
93
96
  title: formatMessage(commonMessages.layoutWide),
94
97
  tabIndex: null
95
98
  }, {
96
99
  type: 'button',
97
- icon: ExpandHorizontalIcon,
98
- iconFallback: FullWidthIcon,
100
+ icon: () => /*#__PURE__*/React.createElement(ExpandHorizontalIcon, {
101
+ label: formatMessage(commonMessages.layoutFullWidth),
102
+ spacing: "spacious"
103
+ }),
104
+ iconFallback: ExpandHorizontalIcon,
99
105
  onClick: updateExtensionLayout('full-width', editorAnalyticsAPI),
100
106
  selected: layout === 'full-width',
101
107
  title: formatMessage(commonMessages.layoutFullWidth),
@@ -186,7 +192,7 @@ const editButton = (formatMessage, extensionState, applyChangeToContextPanel, ed
186
192
  id: 'editor.extension.edit',
187
193
  type: 'button',
188
194
  icon: EditIcon,
189
- iconFallback: LegacyEditIcon,
195
+ iconFallback: EditIcon,
190
196
  testId: 'extension-toolbar-edit-button',
191
197
  // Taking the latest `updateExtension` from plugin state to avoid race condition @see ED-8501
192
198
  onClick: (state, dispatch, view) => {
@@ -261,7 +267,7 @@ export const getToolbarConfig = ({
261
267
  editorAnalyticsAPI,
262
268
  extensionApi
263
269
  }) => (state, intl) => {
264
- var _hoverDecoration, _hoverDecoration2, _hoverDecoration3, _hoverDecoration4;
270
+ var _hoverDecoration5, _hoverDecoration6, _hoverDecoration7, _hoverDecoration8;
265
271
  const {
266
272
  formatMessage
267
273
  } = intl;
@@ -299,6 +305,15 @@ export const getToolbarConfig = ({
299
305
  };
300
306
  };
301
307
  }
308
+ const hoverDecorationProps = (nodeType, className) => {
309
+ var _hoverDecoration, _hoverDecoration2, _hoverDecoration3, _hoverDecoration4;
310
+ return fg('platform_editor_controls_patch_1') ? {
311
+ onMouseEnter: (_hoverDecoration = hoverDecoration) === null || _hoverDecoration === void 0 ? void 0 : _hoverDecoration(nodeType, true, className),
312
+ onMouseLeave: (_hoverDecoration2 = hoverDecoration) === null || _hoverDecoration2 === void 0 ? void 0 : _hoverDecoration2(nodeType, false, className),
313
+ onFocus: (_hoverDecoration3 = hoverDecoration) === null || _hoverDecoration3 === void 0 ? void 0 : _hoverDecoration3(nodeType, true, className),
314
+ onBlur: (_hoverDecoration4 = hoverDecoration) === null || _hoverDecoration4 === void 0 ? void 0 : _hoverDecoration4(nodeType, false, className)
315
+ } : undefined;
316
+ };
302
317
  return {
303
318
  title: 'Extension floating controls',
304
319
  // Ignored via go/ees005
@@ -306,7 +321,7 @@ export const getToolbarConfig = ({
306
321
  getDomRef: () => extensionState.element.parentElement || undefined,
307
322
  nodeType,
308
323
  onPositionCalculated: (editorView, nextPos) => calculateToolbarPosition(editorView, nextPos, state, extensionObj),
309
- items: [...editButtonItems, ...breakoutItems, ...(editorExperiment('platform_editor_controls', 'control') ? [{
324
+ items: [...editButtonItems, ...breakoutItems, ...(editorExperiment('platform_editor_controls', 'control') || fg('platform_editor_controls_patch_2') ? [{
310
325
  type: 'separator',
311
326
  hidden: editButtonItems.length === 0 && breakoutItems.length === 0
312
327
  }, {
@@ -324,14 +339,17 @@ export const getToolbarConfig = ({
324
339
  }, {
325
340
  id: 'editor.extension.delete',
326
341
  type: 'button',
327
- icon: DeleteIcon,
328
- iconFallback: RemoveIcon,
342
+ icon: () => /*#__PURE__*/React.createElement(DeleteIcon, {
343
+ label: formatMessage(commonMessages.remove),
344
+ spacing: "spacious"
345
+ }),
346
+ iconFallback: DeleteIcon,
329
347
  appearance: 'danger',
330
348
  onClick: removeExtension(editorAnalyticsAPI),
331
- onMouseEnter: (_hoverDecoration = hoverDecoration) === null || _hoverDecoration === void 0 ? void 0 : _hoverDecoration(nodeType, true),
332
- onMouseLeave: (_hoverDecoration2 = hoverDecoration) === null || _hoverDecoration2 === void 0 ? void 0 : _hoverDecoration2(nodeType, false),
333
- onFocus: (_hoverDecoration3 = hoverDecoration) === null || _hoverDecoration3 === void 0 ? void 0 : _hoverDecoration3(nodeType, true),
334
- onBlur: (_hoverDecoration4 = hoverDecoration) === null || _hoverDecoration4 === void 0 ? void 0 : _hoverDecoration4(nodeType, false),
349
+ onMouseEnter: (_hoverDecoration5 = hoverDecoration) === null || _hoverDecoration5 === void 0 ? void 0 : _hoverDecoration5(nodeType, true),
350
+ onMouseLeave: (_hoverDecoration6 = hoverDecoration) === null || _hoverDecoration6 === void 0 ? void 0 : _hoverDecoration6(nodeType, false),
351
+ onFocus: (_hoverDecoration7 = hoverDecoration) === null || _hoverDecoration7 === void 0 ? void 0 : _hoverDecoration7(nodeType, true),
352
+ onBlur: (_hoverDecoration8 = hoverDecoration) === null || _hoverDecoration8 === void 0 ? void 0 : _hoverDecoration8(nodeType, false),
335
353
  focusEditoronEnter: true,
336
354
  title: formatMessage(commonMessages.remove),
337
355
  tabIndex: null,
@@ -354,13 +372,15 @@ export const getToolbarConfig = ({
354
372
  },
355
373
  icon: /*#__PURE__*/React.createElement(CopyIcon, {
356
374
  label: "Copy"
357
- })
375
+ }),
376
+ ...hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)
358
377
  }, {
359
378
  title: 'Delete',
360
379
  onClick: removeExtension(editorAnalyticsAPI),
361
380
  icon: /*#__PURE__*/React.createElement(DeleteIcon, {
362
381
  label: "Delete"
363
- })
382
+ }),
383
+ ...hoverDecorationProps(nodeType)
364
384
  }]
365
385
  }])],
366
386
  scrollable: true
@@ -9,8 +9,8 @@ import { css, jsx } from '@emotion/react';
9
9
  import { injectIntl } from 'react-intl-next';
10
10
  import { IconButton } from '@atlaskit/button/new';
11
11
  import { configPanelMessages as messages } from '@atlaskit/editor-common/extensions';
12
- import ChevronDownIcon from '@atlaskit/icon/glyph/chevron-down';
13
- import ChevronRightIcon from '@atlaskit/icon/glyph/chevron-right';
12
+ import ChevronDownIcon from '@atlaskit/icon/utility/chevron-down';
13
+ import ChevronRightIcon from '@atlaskit/icon/utility/chevron-right';
14
14
  import { N40 } from '@atlaskit/theme/colors';
15
15
  const expandContainerStyles = css({
16
16
  borderBottom: `1px solid ${`var(--ds-border, ${N40})`}`
@@ -12,7 +12,7 @@ import { injectIntl } from 'react-intl-next';
12
12
  import Button from '@atlaskit/button/new';
13
13
  import { configPanelMessages as messages } from '@atlaskit/editor-common/extensions';
14
14
  import Heading from '@atlaskit/heading';
15
- import AddCircleIcon from '@atlaskit/icon/glyph/add-circle';
15
+ import AddCircleIcon from '@atlaskit/icon/core/migration/add--add-circle';
16
16
  import { Box, Text, xcss } from '@atlaskit/primitives';
17
17
  import SectionMessage from '@atlaskit/section-message';
18
18
  import Select from '@atlaskit/select';
@@ -171,7 +171,8 @@ class FieldsetField extends React.Component {
171
171
  // Ignored via go/ees005
172
172
  // eslint-disable-next-line react/jsx-props-no-spreading
173
173
  , _extends({}, iconProps, {
174
- size: "small",
174
+ LEGACY_size: "small",
175
+ spacing: "none",
175
176
  label: intl.formatMessage(messages.addField)
176
177
  })),
177
178
  onClick: () => this.setIsAdding(true)
@@ -8,7 +8,7 @@ import React from 'react';
8
8
  import { css, jsx } from '@emotion/react';
9
9
  import { injectIntl } from 'react-intl-next';
10
10
  import { configPanelMessages as messages } from '@atlaskit/editor-common/extensions';
11
- import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
11
+ import CrossCircleIcon from '@atlaskit/icon/core/migration/cross-circle';
12
12
  import { N80, R300 } from '@atlaskit/theme/colors';
13
13
  import Tooltip from '@atlaskit/tooltip';
14
14
  const removableFieldWrapperStyles = css({
@@ -54,7 +54,8 @@ const RemovableField = ({
54
54
  content: intl.formatMessage(messages.removeField),
55
55
  position: "left"
56
56
  }, jsx(CrossCircleIcon, {
57
- size: "small",
57
+ LEGACY_size: "small",
58
+ spacing: "none",
58
59
  label: intl.formatMessage(messages.removeField)
59
60
  }))));
60
61
  };
@@ -8,7 +8,7 @@ import { Fragment, useCallback, useEffect, useRef, useState } from 'react';
8
8
  import { css, jsx } from '@emotion/react';
9
9
  import { FormattedMessage } from 'react-intl-next';
10
10
  import { messages } from '@atlaskit/editor-common/extensions';
11
- import CheckCircleIcon from '@atlaskit/icon/glyph/check-circle';
11
+ import CheckCircleIcon from '@atlaskit/icon/core/migration/success--check-circle';
12
12
  import { Box, Text, xcss } from '@atlaskit/primitives';
13
13
  import { G300, N0 } from '@atlaskit/theme/colors';
14
14
  const noop = () => {};
@@ -63,8 +63,9 @@ export const SaveIndicator = ({
63
63
  "data-testid": "save-indicator-content"
64
64
  }, jsx(CheckCircleIcon, {
65
65
  label: "Saving",
66
- primaryColor: `var(--ds-icon-success, ${G300})`,
67
- size: "small"
66
+ color: `var(--ds-icon-success, ${G300})`,
67
+ LEGACY_size: "small",
68
+ spacing: "none"
68
69
  }), jsx(Box, {
69
70
  xcss: saveIndicatorTextStyles
70
71
  }, jsx(Text, null, jsx(FormattedMessage
@@ -1,21 +1,20 @@
1
+ import _defineProperty from "@babel/runtime/helpers/defineProperty";
1
2
  import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
3
+ 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; }
4
+ 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; }
2
5
  import React from 'react';
3
6
  import { messages } from '@atlaskit/editor-common/extensions';
4
7
  import commonMessages from '@atlaskit/editor-common/messages';
5
8
  import { BODIED_EXT_MBE_MARGIN_TOP } from '@atlaskit/editor-common/styles';
6
9
  import { getChildrenInfo as _getChildrenInfo, getNodeName, isReferencedSource } from '@atlaskit/editor-common/utils';
7
10
  import { findParentNodeOfType, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
11
+ import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
8
12
  import ContentWidthNarrowIcon from '@atlaskit/icon/core/content-width-narrow';
9
13
  import ContentWidthWideIcon from '@atlaskit/icon/core/content-width-wide';
10
14
  import CopyIcon from '@atlaskit/icon/core/copy';
11
15
  import DeleteIcon from '@atlaskit/icon/core/delete';
12
- import EditIcon from '@atlaskit/icon/core/edit';
13
16
  import ExpandHorizontalIcon from '@atlaskit/icon/core/expand-horizontal';
14
- import LegacyEditIcon from '@atlaskit/icon/glyph/editor/edit';
15
- import CenterIcon from '@atlaskit/icon/glyph/editor/media-center';
16
- import FullWidthIcon from '@atlaskit/icon/glyph/editor/media-full-width';
17
- import WideIcon from '@atlaskit/icon/glyph/editor/media-wide';
18
- import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
17
+ import EditIcon from '@atlaskit/icon/core/migration/edit--editor-edit';
19
18
  import { fg } from '@atlaskit/platform-feature-flags';
20
19
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
21
20
  import { editExtension } from '../editor-actions/actions';
@@ -23,6 +22,7 @@ import { removeDescendantNodes, removeExtension, updateExtensionLayout } from '.
23
22
  import { pluginKey as macroPluginKey } from './macro/plugin-key';
24
23
  import { getPluginState } from './plugin-factory';
25
24
  import { getSelectedExtension } from './utils';
25
+
26
26
  // non-bodied extensions nested inside panels, blockquotes and lists do not support layouts
27
27
  var isNestedNBM = function isNestedNBM(state, selectedExtNode) {
28
28
  var _state$schema$nodes = state.schema.nodes,
@@ -67,24 +67,39 @@ var breakoutButtonListOptions = function breakoutButtonListOptions(state, format
67
67
  var layout = nodeWithPos.node.attrs.layout;
68
68
  return [{
69
69
  type: 'button',
70
- icon: ContentWidthNarrowIcon,
71
- iconFallback: CenterIcon,
70
+ icon: function icon() {
71
+ return /*#__PURE__*/React.createElement(ContentWidthNarrowIcon, {
72
+ label: formatMessage(commonMessages.layoutFixedWidth),
73
+ spacing: "spacious"
74
+ });
75
+ },
76
+ iconFallback: ContentWidthNarrowIcon,
72
77
  onClick: updateExtensionLayout('default', editorAnalyticsAPI),
73
78
  selected: layout === 'default',
74
79
  title: formatMessage(commonMessages.layoutFixedWidth),
75
80
  tabIndex: null
76
81
  }, {
77
82
  type: 'button',
78
- icon: ContentWidthWideIcon,
79
- iconFallback: WideIcon,
83
+ icon: function icon() {
84
+ return /*#__PURE__*/React.createElement(ContentWidthWideIcon, {
85
+ label: formatMessage(commonMessages.layoutWide),
86
+ spacing: "spacious"
87
+ });
88
+ },
89
+ iconFallback: ContentWidthWideIcon,
80
90
  onClick: updateExtensionLayout('wide', editorAnalyticsAPI),
81
91
  selected: layout === 'wide',
82
92
  title: formatMessage(commonMessages.layoutWide),
83
93
  tabIndex: null
84
94
  }, {
85
95
  type: 'button',
86
- icon: ExpandHorizontalIcon,
87
- iconFallback: FullWidthIcon,
96
+ icon: function icon() {
97
+ return /*#__PURE__*/React.createElement(ExpandHorizontalIcon, {
98
+ label: formatMessage(commonMessages.layoutFullWidth),
99
+ spacing: "spacious"
100
+ });
101
+ },
102
+ iconFallback: ExpandHorizontalIcon,
88
103
  onClick: updateExtensionLayout('full-width', editorAnalyticsAPI),
89
104
  selected: layout === 'full-width',
90
105
  title: formatMessage(commonMessages.layoutFullWidth),
@@ -175,7 +190,7 @@ var editButton = function editButton(formatMessage, extensionState, applyChangeT
175
190
  id: 'editor.extension.edit',
176
191
  type: 'button',
177
192
  icon: EditIcon,
178
- iconFallback: LegacyEditIcon,
193
+ iconFallback: EditIcon,
179
194
  testId: 'extension-toolbar-edit-button',
180
195
  // Taking the latest `updateExtension` from plugin state to avoid race condition @see ED-8501
181
196
  onClick: function onClick(state, dispatch, view) {
@@ -247,7 +262,7 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
247
262
  editorAnalyticsAPI = _ref.editorAnalyticsAPI,
248
263
  extensionApi = _ref.extensionApi;
249
264
  return function (state, intl) {
250
- var _hoverDecoration, _hoverDecoration2, _hoverDecoration3, _hoverDecoration4;
265
+ var _hoverDecoration5, _hoverDecoration6, _hoverDecoration7, _hoverDecoration8;
251
266
  var formatMessage = intl.formatMessage;
252
267
  var extensionState = getPluginState(state);
253
268
  if (fg('platform_editor_legacy_content_macro')) {
@@ -288,6 +303,15 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
288
303
  };
289
304
  };
290
305
  }
306
+ var hoverDecorationProps = function hoverDecorationProps(nodeType, className) {
307
+ var _hoverDecoration, _hoverDecoration2, _hoverDecoration3, _hoverDecoration4;
308
+ return fg('platform_editor_controls_patch_1') ? {
309
+ onMouseEnter: (_hoverDecoration = hoverDecoration) === null || _hoverDecoration === void 0 ? void 0 : _hoverDecoration(nodeType, true, className),
310
+ onMouseLeave: (_hoverDecoration2 = hoverDecoration) === null || _hoverDecoration2 === void 0 ? void 0 : _hoverDecoration2(nodeType, false, className),
311
+ onFocus: (_hoverDecoration3 = hoverDecoration) === null || _hoverDecoration3 === void 0 ? void 0 : _hoverDecoration3(nodeType, true, className),
312
+ onBlur: (_hoverDecoration4 = hoverDecoration) === null || _hoverDecoration4 === void 0 ? void 0 : _hoverDecoration4(nodeType, false, className)
313
+ } : undefined;
314
+ };
291
315
  return {
292
316
  title: 'Extension floating controls',
293
317
  // Ignored via go/ees005
@@ -299,7 +323,7 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
299
323
  onPositionCalculated: function onPositionCalculated(editorView, nextPos) {
300
324
  return calculateToolbarPosition(editorView, nextPos, state, extensionObj);
301
325
  },
302
- items: [].concat(_toConsumableArray(editButtonItems), _toConsumableArray(breakoutItems), _toConsumableArray(editorExperiment('platform_editor_controls', 'control') ? [{
326
+ items: [].concat(_toConsumableArray(editButtonItems), _toConsumableArray(breakoutItems), _toConsumableArray(editorExperiment('platform_editor_controls', 'control') || fg('platform_editor_controls_patch_2') ? [{
303
327
  type: 'separator',
304
328
  hidden: editButtonItems.length === 0 && breakoutItems.length === 0
305
329
  }, {
@@ -317,14 +341,19 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
317
341
  }, {
318
342
  id: 'editor.extension.delete',
319
343
  type: 'button',
320
- icon: DeleteIcon,
321
- iconFallback: RemoveIcon,
344
+ icon: function icon() {
345
+ return /*#__PURE__*/React.createElement(DeleteIcon, {
346
+ label: formatMessage(commonMessages.remove),
347
+ spacing: "spacious"
348
+ });
349
+ },
350
+ iconFallback: DeleteIcon,
322
351
  appearance: 'danger',
323
352
  onClick: removeExtension(editorAnalyticsAPI),
324
- onMouseEnter: (_hoverDecoration = hoverDecoration) === null || _hoverDecoration === void 0 ? void 0 : _hoverDecoration(nodeType, true),
325
- onMouseLeave: (_hoverDecoration2 = hoverDecoration) === null || _hoverDecoration2 === void 0 ? void 0 : _hoverDecoration2(nodeType, false),
326
- onFocus: (_hoverDecoration3 = hoverDecoration) === null || _hoverDecoration3 === void 0 ? void 0 : _hoverDecoration3(nodeType, true),
327
- onBlur: (_hoverDecoration4 = hoverDecoration) === null || _hoverDecoration4 === void 0 ? void 0 : _hoverDecoration4(nodeType, false),
353
+ onMouseEnter: (_hoverDecoration5 = hoverDecoration) === null || _hoverDecoration5 === void 0 ? void 0 : _hoverDecoration5(nodeType, true),
354
+ onMouseLeave: (_hoverDecoration6 = hoverDecoration) === null || _hoverDecoration6 === void 0 ? void 0 : _hoverDecoration6(nodeType, false),
355
+ onFocus: (_hoverDecoration7 = hoverDecoration) === null || _hoverDecoration7 === void 0 ? void 0 : _hoverDecoration7(nodeType, true),
356
+ onBlur: (_hoverDecoration8 = hoverDecoration) === null || _hoverDecoration8 === void 0 ? void 0 : _hoverDecoration8(nodeType, false),
328
357
  focusEditoronEnter: true,
329
358
  title: formatMessage(commonMessages.remove),
330
359
  tabIndex: null,
@@ -337,7 +366,7 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
337
366
  separator: breakoutItems.length > 0 ? 'both' : 'end'
338
367
  }, {
339
368
  type: 'overflow-dropdown',
340
- options: [{
369
+ options: [_objectSpread({
341
370
  title: 'Copy',
342
371
  onClick: function onClick() {
343
372
  var _extensionApi$core, _extensionApi$floatin;
@@ -348,13 +377,13 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
348
377
  icon: /*#__PURE__*/React.createElement(CopyIcon, {
349
378
  label: "Copy"
350
379
  })
351
- }, {
380
+ }, hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)), _objectSpread({
352
381
  title: 'Delete',
353
382
  onClick: removeExtension(editorAnalyticsAPI),
354
383
  icon: /*#__PURE__*/React.createElement(DeleteIcon, {
355
384
  label: "Delete"
356
385
  })
357
- }]
386
+ }, hoverDecorationProps(nodeType))]
358
387
  }])),
359
388
  scrollable: true
360
389
  };
@@ -10,8 +10,8 @@ import { css, jsx } from '@emotion/react';
10
10
  import { injectIntl } from 'react-intl-next';
11
11
  import { IconButton } from '@atlaskit/button/new';
12
12
  import { configPanelMessages as messages } from '@atlaskit/editor-common/extensions';
13
- import ChevronDownIcon from '@atlaskit/icon/glyph/chevron-down';
14
- import ChevronRightIcon from '@atlaskit/icon/glyph/chevron-right';
13
+ import ChevronDownIcon from '@atlaskit/icon/utility/chevron-down';
14
+ import ChevronRightIcon from '@atlaskit/icon/utility/chevron-right';
15
15
  import { N40 } from '@atlaskit/theme/colors';
16
16
  var expandContainerStyles = css({
17
17
  borderBottom: "1px solid ".concat("var(--ds-border, ".concat(N40, ")"))
@@ -23,7 +23,7 @@ import { injectIntl } from 'react-intl-next';
23
23
  import Button from '@atlaskit/button/new';
24
24
  import { configPanelMessages as messages } from '@atlaskit/editor-common/extensions';
25
25
  import Heading from '@atlaskit/heading';
26
- import AddCircleIcon from '@atlaskit/icon/glyph/add-circle';
26
+ import AddCircleIcon from '@atlaskit/icon/core/migration/add--add-circle';
27
27
  import { Box, Text, xcss } from '@atlaskit/primitives';
28
28
  import SectionMessage from '@atlaskit/section-message';
29
29
  import Select from '@atlaskit/select';
@@ -201,7 +201,8 @@ var FieldsetField = /*#__PURE__*/function (_React$Component) {
201
201
  // Ignored via go/ees005
202
202
  // eslint-disable-next-line react/jsx-props-no-spreading
203
203
  , _extends({}, iconProps, {
204
- size: "small",
204
+ LEGACY_size: "small",
205
+ spacing: "none",
205
206
  label: intl.formatMessage(messages.addField)
206
207
  }));
207
208
  },
@@ -8,7 +8,7 @@ import React from 'react';
8
8
  import { css, jsx } from '@emotion/react';
9
9
  import { injectIntl } from 'react-intl-next';
10
10
  import { configPanelMessages as messages } from '@atlaskit/editor-common/extensions';
11
- import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
11
+ import CrossCircleIcon from '@atlaskit/icon/core/migration/cross-circle';
12
12
  import { N80, R300 } from '@atlaskit/theme/colors';
13
13
  import Tooltip from '@atlaskit/tooltip';
14
14
  var removableFieldWrapperStyles = css({
@@ -55,7 +55,8 @@ var RemovableField = function RemovableField(_ref) {
55
55
  content: intl.formatMessage(messages.removeField),
56
56
  position: "left"
57
57
  }, jsx(CrossCircleIcon, {
58
- size: "small",
58
+ LEGACY_size: "small",
59
+ spacing: "none",
59
60
  label: intl.formatMessage(messages.removeField)
60
61
  }))));
61
62
  };
@@ -9,7 +9,7 @@ import { Fragment, useCallback, useEffect, useRef, useState } from 'react';
9
9
  import { css, jsx } from '@emotion/react';
10
10
  import { FormattedMessage } from 'react-intl-next';
11
11
  import { messages } from '@atlaskit/editor-common/extensions';
12
- import CheckCircleIcon from '@atlaskit/icon/glyph/check-circle';
12
+ import CheckCircleIcon from '@atlaskit/icon/core/migration/success--check-circle';
13
13
  import { Box, Text, xcss } from '@atlaskit/primitives';
14
14
  import { G300, N0 } from '@atlaskit/theme/colors';
15
15
  var noop = function noop() {};
@@ -69,8 +69,9 @@ export var SaveIndicator = function SaveIndicator(_ref) {
69
69
  "data-testid": "save-indicator-content"
70
70
  }, jsx(CheckCircleIcon, {
71
71
  label: "Saving",
72
- primaryColor: "var(--ds-icon-success, ".concat(G300, ")"),
73
- size: "small"
72
+ color: "var(--ds-icon-success, ".concat(G300, ")"),
73
+ LEGACY_size: "small",
74
+ spacing: "none"
74
75
  }), jsx(Box, {
75
76
  xcss: saveIndicatorTextStyles
76
77
  }, jsx(Text, null, jsx(FormattedMessage
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-extension",
3
- "version": "5.1.0",
3
+ "version": "5.1.2",
4
4
  "description": "editor-plugin-extension plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -29,10 +29,10 @@
29
29
  "@atlaskit/adf-utils": "^19.19.0",
30
30
  "@atlaskit/analytics-next": "^11.0.0",
31
31
  "@atlaskit/avatar": "^25.0.0",
32
- "@atlaskit/button": "^22.0.0",
32
+ "@atlaskit/button": "^23.0.0",
33
33
  "@atlaskit/checkbox": "^17.0.0",
34
34
  "@atlaskit/datetime-picker": "^16.2.0",
35
- "@atlaskit/editor-common": "^102.15.0",
35
+ "@atlaskit/editor-common": "^102.16.0",
36
36
  "@atlaskit/editor-json-transformer": "^8.24.0",
37
37
  "@atlaskit/editor-plugin-analytics": "^2.2.0",
38
38
  "@atlaskit/editor-plugin-context-identifier": "^2.0.0",
@@ -46,7 +46,7 @@
46
46
  "@atlaskit/empty-state": "^9.0.0",
47
47
  "@atlaskit/form": "^12.0.0",
48
48
  "@atlaskit/heading": "^5.1.0",
49
- "@atlaskit/icon": "^25.3.0",
49
+ "@atlaskit/icon": "^25.4.0",
50
50
  "@atlaskit/platform-feature-flags": "^1.1.0",
51
51
  "@atlaskit/primitives": "^14.2.0",
52
52
  "@atlaskit/radio": "^8.0.0",
@@ -58,7 +58,7 @@
58
58
  "@atlaskit/textarea": "^8.0.0",
59
59
  "@atlaskit/textfield": "^8.0.0",
60
60
  "@atlaskit/theme": "^18.0.0",
61
- "@atlaskit/tmp-editor-statsig": "^4.5.0",
61
+ "@atlaskit/tmp-editor-statsig": "^4.6.0",
62
62
  "@atlaskit/toggle": "^15.0.0",
63
63
  "@atlaskit/tokens": "^4.5.0",
64
64
  "@atlaskit/tooltip": "^20.0.0",
@@ -120,6 +120,12 @@
120
120
  },
121
121
  "platform_editor_extension_deprecation_status": {
122
122
  "type": "boolean"
123
+ },
124
+ "platform_editor_controls_patch_1": {
125
+ "type": "boolean"
126
+ },
127
+ "platform_editor_controls_patch_2": {
128
+ "type": "boolean"
123
129
  }
124
130
  },
125
131
  "stricter": {