@atlaskit/editor-plugin-insert-block 7.0.28 → 7.0.29

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,13 @@
1
1
  # @atlaskit/editor-plugin-insert-block
2
2
 
3
+ ## 7.0.29
4
+
5
+ ### Patch Changes
6
+
7
+ - [`90abe9b926a6f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/90abe9b926a6f) -
8
+ Icon entrypoint migration
9
+ - Updated dependencies
10
+
3
11
  ## 7.0.28
4
12
 
5
13
  ### Patch Changes
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
9
9
  var _react2 = require("@emotion/react");
10
10
  var _keymaps = require("@atlaskit/editor-common/keymaps");
11
11
  var _uiMenu = require("@atlaskit/editor-common/ui-menu");
12
- var _addEditorAdd = _interopRequireDefault(require("@atlaskit/icon/core/migration/add--editor-add"));
12
+ var _add = _interopRequireDefault(require("@atlaskit/icon/core/add"));
13
13
  var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/migration/chevron-down"));
14
14
  var _styles = require("./styles");
15
15
  /**
@@ -24,7 +24,7 @@ var DropDownButtonIcon = /*#__PURE__*/_react.default.memo(function (props) {
24
24
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
25
25
  (0, _react2.jsx)("span", {
26
26
  css: _styles.triggerWrapper
27
- }, (0, _react2.jsx)(_addEditorAdd.default, {
27
+ }, (0, _react2.jsx)(_add.default, {
28
28
  label: props.label,
29
29
  color: "currentColor",
30
30
  spacing: "spacious"
@@ -28,6 +28,7 @@ var _picker = require("@atlaskit/emoji/picker");
28
28
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
29
29
  var _colors = require("@atlaskit/theme/colors");
30
30
  var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
31
+ var _filterDropdownItems = require("../toolbar-components/hooks/filterDropdownItems");
31
32
  var _blockInsertMenu = require("./block-insert-menu");
32
33
  var _createItems3 = require("./create-items");
33
34
  var _templateObject;
@@ -228,7 +229,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
228
229
  }
229
230
  });
230
231
  (0, _defineProperty2.default)(_this, "toggleTableSelector", function () {
231
- var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.TOOLBAR;
232
+ var _inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.TOOLBAR;
232
233
  _this.setState(function (prevState) {
233
234
  return {
234
235
  isTableSelectorOpen: !prevState.isTableSelectorOpen
@@ -451,7 +452,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
451
452
  editorView.focus();
452
453
  }
453
454
  switch (item.value.name) {
454
- case 'link':
455
+ case _filterDropdownItems.LINK_BUTTON_KEY:
455
456
  _this.toggleLinkPanel(inputMethod);
456
457
  break;
457
458
  case 'table':
@@ -12,21 +12,21 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
12
12
  var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
13
13
  var _fieldText = _interopRequireDefault(require("@atlaskit/icon-lab/core/field-text"));
14
14
  var _lozenge = _interopRequireDefault(require("@atlaskit/icon-lab/core/lozenge"));
15
- var _angleBracketsEditorCode = _interopRequireDefault(require("@atlaskit/icon/core/migration/angle-brackets--editor-code"));
16
- var _calendarEditorDate = _interopRequireDefault(require("@atlaskit/icon/core/migration/calendar--editor-date"));
15
+ var _angleBrackets = _interopRequireDefault(require("@atlaskit/icon/core/angle-brackets"));
16
+ var _calendar = _interopRequireDefault(require("@atlaskit/icon/core/calendar"));
17
+ var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/core/chevron-right"));
18
+ var _decision = _interopRequireDefault(require("@atlaskit/icon/core/decision"));
19
+ var _emoji = _interopRequireDefault(require("@atlaskit/icon/core/emoji"));
20
+ var _grid = _interopRequireDefault(require("@atlaskit/icon/core/grid"));
21
+ var _image = _interopRequireDefault(require("@atlaskit/icon/core/image"));
22
+ var _layoutTwoColumns = _interopRequireDefault(require("@atlaskit/icon/core/layout-two-columns"));
23
+ var _link = _interopRequireDefault(require("@atlaskit/icon/core/link"));
24
+ var _mention = _interopRequireDefault(require("@atlaskit/icon/core/mention"));
17
25
  var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/migration/chevron-down"));
18
- var _chevronRightChevronRightCircle = _interopRequireDefault(require("@atlaskit/icon/core/migration/chevron-right--chevron-right-circle"));
19
- var _decisionEditorDecision = _interopRequireDefault(require("@atlaskit/icon/core/migration/decision--editor-decision"));
20
- var _emojiEditorEmoji = _interopRequireDefault(require("@atlaskit/icon/core/migration/emoji--editor-emoji"));
21
- var _gridEditorTable = _interopRequireDefault(require("@atlaskit/icon/core/migration/grid--editor-table"));
22
- var _imageEditorImage = _interopRequireDefault(require("@atlaskit/icon/core/migration/image--editor-image"));
23
- var _layoutTwoColumnsEditorLayoutTwoEqual = _interopRequireDefault(require("@atlaskit/icon/core/migration/layout-two-columns--editor-layout-two-equal"));
24
- var _linkEditorLink = _interopRequireDefault(require("@atlaskit/icon/core/migration/link--editor-link"));
25
- var _mentionEditorMention = _interopRequireDefault(require("@atlaskit/icon/core/migration/mention--editor-mention"));
26
- var _minusEditorHorizontalRule = _interopRequireDefault(require("@atlaskit/icon/core/migration/minus--editor-horizontal-rule"));
27
- var _quotationMarkQuote = _interopRequireDefault(require("@atlaskit/icon/core/migration/quotation-mark--quote"));
28
- var _showMoreHorizontalEditorMore = _interopRequireDefault(require("@atlaskit/icon/core/migration/show-more-horizontal--editor-more"));
29
- var _statusInformationEditorInfo = _interopRequireDefault(require("@atlaskit/icon/core/migration/status-information--editor-info"));
26
+ var _minus = _interopRequireDefault(require("@atlaskit/icon/core/minus"));
27
+ var _quotationMark = _interopRequireDefault(require("@atlaskit/icon/core/quotation-mark"));
28
+ var _showMoreHorizontal = _interopRequireDefault(require("@atlaskit/icon/core/show-more-horizontal"));
29
+ var _statusInformation = _interopRequireDefault(require("@atlaskit/icon/core/status-information"));
30
30
  var _task = _interopRequireDefault(require("@atlaskit/icon/core/task"));
31
31
  var _task2 = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/task"));
32
32
  var _text = _interopRequireDefault(require("@atlaskit/icon/glyph/media-services/text"));
@@ -91,7 +91,7 @@ var link = exports.link = mem(function (init) {
91
91
  disabled: init.disabled,
92
92
  name: 'link',
93
93
  shortcut: (0, _keymaps.tooltip)(_keymaps.addLink),
94
- Icon: _linkEditorLink.default,
94
+ Icon: _link.default,
95
95
  'aria-haspopup': init['aria-haspopup'],
96
96
  'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(_keymaps.addLink)
97
97
  });
@@ -102,7 +102,7 @@ var media = exports.media = mem(function (init) {
102
102
  tooltipDescription: init.tooltipDescription,
103
103
  disabled: init.disabled,
104
104
  name: 'media',
105
- Icon: _imageEditorImage.default
105
+ Icon: _image.default
106
106
  });
107
107
  });
108
108
  var imageUpload = exports.imageUpload = mem(function (init) {
@@ -111,7 +111,7 @@ var imageUpload = exports.imageUpload = mem(function (init) {
111
111
  tooltipDescription: init.tooltipDescription,
112
112
  disabled: init.disabled,
113
113
  name: 'image upload',
114
- Icon: _imageEditorImage.default
114
+ Icon: _image.default
115
115
  });
116
116
  });
117
117
  var mention = exports.mention = mem(function (init) {
@@ -120,7 +120,7 @@ var mention = exports.mention = mem(function (init) {
120
120
  tooltipDescription: init.tooltipDescription,
121
121
  disabled: init.disabled,
122
122
  name: 'mention',
123
- Icon: _mentionEditorMention.default,
123
+ Icon: _mention.default,
124
124
  shortcut: '@',
125
125
  'aria-haspopup': init['aria-haspopup'],
126
126
  'aria-keyshortcuts': 'Shift+2 Space'
@@ -132,7 +132,7 @@ var emoji = exports.emoji = mem(function (init) {
132
132
  tooltipDescription: init.tooltipDescription,
133
133
  disabled: init.disabled,
134
134
  name: 'emoji',
135
- Icon: _emojiEditorEmoji.default,
135
+ Icon: _emoji.default,
136
136
  shortcut: ':',
137
137
  'aria-haspopup': init['aria-haspopup'],
138
138
  'aria-keyshortcuts': 'Shift+;'
@@ -144,7 +144,7 @@ var table = exports.table = mem(function (init) {
144
144
  tooltipDescription: init.tooltipDescription,
145
145
  disabled: init.disabled,
146
146
  name: 'table',
147
- Icon: _gridEditorTable.default,
147
+ Icon: _grid.default,
148
148
  shortcut: (0, _keymaps.tooltip)(_keymaps.toggleTable),
149
149
  'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(_keymaps.toggleTable)
150
150
  });
@@ -170,7 +170,7 @@ var layout = exports.layout = mem(function (init) {
170
170
  tooltipDescription: init.tooltipDescription,
171
171
  disabled: init.disabled,
172
172
  name: 'layout',
173
- Icon: _layoutTwoColumnsEditorLayoutTwoEqual.default
173
+ Icon: _layoutTwoColumns.default
174
174
  });
175
175
  });
176
176
  var codeblock = exports.codeblock = mem(function (init) {
@@ -179,7 +179,7 @@ var codeblock = exports.codeblock = mem(function (init) {
179
179
  tooltipDescription: init.tooltipDescription,
180
180
  disabled: init.disabled,
181
181
  name: 'codeblock',
182
- Icon: _angleBracketsEditorCode.default,
182
+ Icon: _angleBrackets.default,
183
183
  shortcut: init.shortcut,
184
184
  'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(init.shortcut)
185
185
  });
@@ -190,7 +190,7 @@ var panel = exports.panel = mem(function (init) {
190
190
  tooltipDescription: init.tooltipDescription,
191
191
  disabled: init.disabled,
192
192
  name: 'panel',
193
- Icon: _statusInformationEditorInfo.default,
193
+ Icon: _statusInformation.default,
194
194
  shortcut: init.shortcut,
195
195
  'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(init.shortcut)
196
196
  });
@@ -201,7 +201,7 @@ var blockquote = exports.blockquote = mem(function (init) {
201
201
  tooltipDescription: init.tooltipDescription,
202
202
  disabled: init.disabled,
203
203
  name: 'blockquote',
204
- Icon: _quotationMarkQuote.default,
204
+ Icon: _quotationMark.default,
205
205
  shortcut: init.shortcut,
206
206
  'aria-keyshortcuts': 'Shift+. Space'
207
207
  });
@@ -212,7 +212,7 @@ var decision = exports.decision = mem(function (init) {
212
212
  tooltipDescription: init.tooltipDescription,
213
213
  disabled: init.disabled,
214
214
  name: 'decision',
215
- Icon: _decisionEditorDecision.default,
215
+ Icon: _decision.default,
216
216
  shortcut: '<>',
217
217
  'aria-keyshortcuts': 'Shift+, Shift+. Space'
218
218
  });
@@ -223,7 +223,7 @@ var horizontalrule = exports.horizontalrule = mem(function (init) {
223
223
  tooltipDescription: init.tooltipDescription,
224
224
  disabled: init.disabled,
225
225
  name: 'horizontalrule',
226
- Icon: _minusEditorHorizontalRule.default,
226
+ Icon: _minus.default,
227
227
  shortcut: '---',
228
228
  'aria-keyshortcuts': '- - -'
229
229
  });
@@ -235,7 +235,7 @@ var expand = exports.expand = mem(function (init) {
235
235
  disabled: init.disabled,
236
236
  name: 'expand',
237
237
  Icon: function Icon(iconProps) {
238
- return (0, _react2.jsx)(_chevronRightChevronRightCircle.default, {
238
+ return (0, _react2.jsx)(_chevronRight.default, {
239
239
  label: iconProps.label,
240
240
  size: "small"
241
241
  });
@@ -248,7 +248,7 @@ var date = exports.date = mem(function (init) {
248
248
  tooltipDescription: init.tooltipDescription,
249
249
  disabled: init.disabled,
250
250
  name: 'date',
251
- Icon: _calendarEditorDate.default,
251
+ Icon: _calendar.default,
252
252
  shortcut: '//',
253
253
  'aria-keyshortcuts': '/ / Enter'
254
254
  });
@@ -300,7 +300,7 @@ var more = exports.more = mem(function (init) {
300
300
  disabled: init.disabled,
301
301
  name: 'macro',
302
302
  Icon: function Icon() {
303
- return (0, _react2.jsx)(_showMoreHorizontalEditorMore.default, {
303
+ return (0, _react2.jsx)(_showMoreHorizontal.default, {
304
304
  label: "",
305
305
  color: "currentColor"
306
306
  });
@@ -20,6 +20,7 @@ var _editorToolbar = require("@atlaskit/editor-toolbar");
20
20
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
21
21
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
22
22
  var _InsertMenu = _interopRequireWildcard(require("../ElementBrowser/InsertMenu"));
23
+ var _filterDropdownItems = require("./hooks/filterDropdownItems");
23
24
  var _useEmojiPickerPopup = require("./hooks/useEmojiPickerPopup");
24
25
  var _useInsertButtonState2 = require("./hooks/useInsertButtonState");
25
26
  var _useTableSelectorPopup = require("./hooks/useTableSelectorPopup");
@@ -112,7 +113,7 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
112
113
  editorView.focus();
113
114
  }
114
115
  switch (item.value.name) {
115
- case 'link':
116
+ case _filterDropdownItems.LINK_BUTTON_KEY:
116
117
  api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$hyperlink = api.hyperlink) === null || _api$hyperlink === void 0 ? void 0 : _api$hyperlink.commands.showLinkToolbar(inputMethod));
117
118
  break;
118
119
  case 'table':
@@ -3,6 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
+ exports.LINK_BUTTON_KEY = void 0;
6
7
  exports.filterDropdownItemsByBreakpoint = filterDropdownItemsByBreakpoint;
7
8
  var ITEM_TO_BUTTON_MAP = {
8
9
  action: 'taskList',
@@ -14,6 +15,7 @@ var ITEM_TO_BUTTON_MAP = {
14
15
  layout: 'layout',
15
16
  codeblock: 'codeBlock'
16
17
  };
18
+ var LINK_BUTTON_KEY = exports.LINK_BUTTON_KEY = 'link';
17
19
  var BREAKPOINT_ORDER = ['sm', 'md', 'lg', 'xl'];
18
20
 
19
21
  /**
@@ -30,6 +32,10 @@ function isButtonVisibleAtBreakpoint(buttonShowAt, currentBreakpoint) {
30
32
  function filterDropdownItemsByBreakpoint(items, currentBreakpoint, toolbarConfig) {
31
33
  return items.filter(function (item) {
32
34
  var itemName = item.value.name;
35
+ // filter out link button because it's always visible on the toolbar
36
+ if (itemName === LINK_BUTTON_KEY) {
37
+ return false;
38
+ }
33
39
  var buttonKey = ITEM_TO_BUTTON_MAP[itemName];
34
40
  if (!buttonKey) {
35
41
  return true;
@@ -8,7 +8,7 @@ import React from 'react';
8
8
  import { jsx } from '@emotion/react';
9
9
  import { ToolTipContent } from '@atlaskit/editor-common/keymaps';
10
10
  import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
11
- import AddIcon from '@atlaskit/icon/core/migration/add--editor-add';
11
+ import AddIcon from '@atlaskit/icon/core/add';
12
12
  import ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down';
13
13
  import { triggerWrapper } from './styles';
14
14
  const DropDownButtonIcon = /*#__PURE__*/React.memo(props =>
@@ -23,6 +23,7 @@ import { EmojiPicker as AkEmojiPicker } from '@atlaskit/emoji/picker';
23
23
  import { fg } from '@atlaskit/platform-feature-flags';
24
24
  import { N20A, N30A } from '@atlaskit/theme/colors';
25
25
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
26
+ import { LINK_BUTTON_KEY } from '../toolbar-components/hooks/filterDropdownItems';
26
27
  import { BlockInsertMenu } from './block-insert-menu';
27
28
  import { createItems } from './create-items';
28
29
  // Ignored via go/ees005
@@ -235,7 +236,7 @@ export class ToolbarInsertBlock extends React.PureComponent {
235
236
  this.dropdownButtonRef = new WeakRef(ref);
236
237
  }
237
238
  });
238
- _defineProperty(this, "toggleTableSelector", (inputMethod = INPUT_METHOD.TOOLBAR) => {
239
+ _defineProperty(this, "toggleTableSelector", (_inputMethod = INPUT_METHOD.TOOLBAR) => {
239
240
  this.setState(prevState => ({
240
241
  isTableSelectorOpen: !prevState.isTableSelectorOpen
241
242
  }));
@@ -481,7 +482,7 @@ export class ToolbarInsertBlock extends React.PureComponent {
481
482
  editorView.focus();
482
483
  }
483
484
  switch (item.value.name) {
484
- case 'link':
485
+ case LINK_BUTTON_KEY:
485
486
  this.toggleLinkPanel(inputMethod);
486
487
  break;
487
488
  case 'table':
@@ -11,21 +11,21 @@ import { addLink, getAriaKeyshortcuts, toggleTable, tooltip } from '@atlaskit/ed
11
11
  import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
12
12
  import FieldTextIcon from '@atlaskit/icon-lab/core/field-text';
13
13
  import LozengeIcon from '@atlaskit/icon-lab/core/lozenge';
14
- import AngleBracketsIcon from '@atlaskit/icon/core/migration/angle-brackets--editor-code';
15
- import CalendarIcon from '@atlaskit/icon/core/migration/calendar--editor-date';
14
+ import AngleBracketsIcon from '@atlaskit/icon/core/angle-brackets';
15
+ import CalendarIcon from '@atlaskit/icon/core/calendar';
16
+ import ExpandNodeIcon from '@atlaskit/icon/core/chevron-right';
17
+ import DecisionIcon from '@atlaskit/icon/core/decision';
18
+ import EmojiIcon from '@atlaskit/icon/core/emoji';
19
+ import GridIcon from '@atlaskit/icon/core/grid';
20
+ import ImageIcon from '@atlaskit/icon/core/image';
21
+ import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
22
+ import LinkIcon from '@atlaskit/icon/core/link';
23
+ import MentionIcon from '@atlaskit/icon/core/mention';
16
24
  import ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down';
17
- import ExpandNodeIcon from '@atlaskit/icon/core/migration/chevron-right--chevron-right-circle';
18
- import DecisionIcon from '@atlaskit/icon/core/migration/decision--editor-decision';
19
- import EmojiIcon from '@atlaskit/icon/core/migration/emoji--editor-emoji';
20
- import GridIcon from '@atlaskit/icon/core/migration/grid--editor-table';
21
- import ImageIcon from '@atlaskit/icon/core/migration/image--editor-image';
22
- import LayoutTwoColumnsIcon from '@atlaskit/icon/core/migration/layout-two-columns--editor-layout-two-equal';
23
- import LinkIcon from '@atlaskit/icon/core/migration/link--editor-link';
24
- import MentionIcon from '@atlaskit/icon/core/migration/mention--editor-mention';
25
- import HorizontalRuleIcon from '@atlaskit/icon/core/migration/minus--editor-horizontal-rule';
26
- import QuotationMarkIcon from '@atlaskit/icon/core/migration/quotation-mark--quote';
27
- import ShowMoreHorizontalIcon from '@atlaskit/icon/core/migration/show-more-horizontal--editor-more';
28
- import InformationIcon from '@atlaskit/icon/core/migration/status-information--editor-info';
25
+ import HorizontalRuleIcon from '@atlaskit/icon/core/minus';
26
+ import QuotationMarkIcon from '@atlaskit/icon/core/quotation-mark';
27
+ import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
28
+ import InformationIcon from '@atlaskit/icon/core/status-information';
29
29
  import TaskIcon from '@atlaskit/icon/core/task';
30
30
  import CheckboxCheckedIconLegacy from '@atlaskit/icon/glyph/editor/task';
31
31
  import PlaceholderTextIcon from '@atlaskit/icon/glyph/media-services/text';
@@ -11,6 +11,7 @@ import { ToolbarButton, ToolbarTooltip, AddIcon, useToolbarUI } from '@atlaskit/
11
11
  import { fg } from '@atlaskit/platform-feature-flags';
12
12
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
13
13
  import InsertMenu, { DEFAULT_HEIGHT } from '../ElementBrowser/InsertMenu';
14
+ import { LINK_BUTTON_KEY } from './hooks/filterDropdownItems';
14
15
  import { useEmojiPickerPopup } from './hooks/useEmojiPickerPopup';
15
16
  import { useInsertButtonState } from './hooks/useInsertButtonState';
16
17
  import { useTableSelectorPopup } from './hooks/useTableSelectorPopup';
@@ -104,7 +105,7 @@ export const InsertButton = ({
104
105
  editorView.focus();
105
106
  }
106
107
  switch (item.value.name) {
107
- case 'link':
108
+ case LINK_BUTTON_KEY:
108
109
  api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$hyperlink = api.hyperlink) === null || _api$hyperlink === void 0 ? void 0 : _api$hyperlink.commands.showLinkToolbar(inputMethod));
109
110
  break;
110
111
  case 'table':
@@ -8,6 +8,7 @@ const ITEM_TO_BUTTON_MAP = {
8
8
  layout: 'layout',
9
9
  codeblock: 'codeBlock'
10
10
  };
11
+ export const LINK_BUTTON_KEY = 'link';
11
12
  const BREAKPOINT_ORDER = ['sm', 'md', 'lg', 'xl'];
12
13
 
13
14
  /**
@@ -24,6 +25,10 @@ function isButtonVisibleAtBreakpoint(buttonShowAt, currentBreakpoint) {
24
25
  export function filterDropdownItemsByBreakpoint(items, currentBreakpoint, toolbarConfig) {
25
26
  return items.filter(item => {
26
27
  const itemName = item.value.name;
28
+ // filter out link button because it's always visible on the toolbar
29
+ if (itemName === LINK_BUTTON_KEY) {
30
+ return false;
31
+ }
27
32
  const buttonKey = ITEM_TO_BUTTON_MAP[itemName];
28
33
  if (!buttonKey) {
29
34
  return true;
@@ -8,7 +8,7 @@ import React from 'react';
8
8
  import { jsx } from '@emotion/react';
9
9
  import { ToolTipContent } from '@atlaskit/editor-common/keymaps';
10
10
  import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
11
- import AddIcon from '@atlaskit/icon/core/migration/add--editor-add';
11
+ import AddIcon from '@atlaskit/icon/core/add';
12
12
  import ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down';
13
13
  import { triggerWrapper } from './styles';
14
14
  var DropDownButtonIcon = /*#__PURE__*/React.memo(function (props) {
@@ -38,6 +38,7 @@ import { EmojiPicker as AkEmojiPicker } from '@atlaskit/emoji/picker';
38
38
  import { fg } from '@atlaskit/platform-feature-flags';
39
39
  import { N20A, N30A } from '@atlaskit/theme/colors';
40
40
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
41
+ import { LINK_BUTTON_KEY } from '../toolbar-components/hooks/filterDropdownItems';
41
42
  import { BlockInsertMenu } from './block-insert-menu';
42
43
  import { createItems } from './create-items';
43
44
  // Ignored via go/ees005
@@ -222,7 +223,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
222
223
  }
223
224
  });
224
225
  _defineProperty(_this, "toggleTableSelector", function () {
225
- var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.TOOLBAR;
226
+ var _inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.TOOLBAR;
226
227
  _this.setState(function (prevState) {
227
228
  return {
228
229
  isTableSelectorOpen: !prevState.isTableSelectorOpen
@@ -445,7 +446,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
445
446
  editorView.focus();
446
447
  }
447
448
  switch (item.value.name) {
448
- case 'link':
449
+ case LINK_BUTTON_KEY:
449
450
  _this.toggleLinkPanel(inputMethod);
450
451
  break;
451
452
  case 'table':
@@ -11,21 +11,21 @@ import { addLink, getAriaKeyshortcuts, toggleTable, tooltip } from '@atlaskit/ed
11
11
  import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
12
12
  import FieldTextIcon from '@atlaskit/icon-lab/core/field-text';
13
13
  import LozengeIcon from '@atlaskit/icon-lab/core/lozenge';
14
- import AngleBracketsIcon from '@atlaskit/icon/core/migration/angle-brackets--editor-code';
15
- import CalendarIcon from '@atlaskit/icon/core/migration/calendar--editor-date';
14
+ import AngleBracketsIcon from '@atlaskit/icon/core/angle-brackets';
15
+ import CalendarIcon from '@atlaskit/icon/core/calendar';
16
+ import ExpandNodeIcon from '@atlaskit/icon/core/chevron-right';
17
+ import DecisionIcon from '@atlaskit/icon/core/decision';
18
+ import EmojiIcon from '@atlaskit/icon/core/emoji';
19
+ import GridIcon from '@atlaskit/icon/core/grid';
20
+ import ImageIcon from '@atlaskit/icon/core/image';
21
+ import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
22
+ import LinkIcon from '@atlaskit/icon/core/link';
23
+ import MentionIcon from '@atlaskit/icon/core/mention';
16
24
  import ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down';
17
- import ExpandNodeIcon from '@atlaskit/icon/core/migration/chevron-right--chevron-right-circle';
18
- import DecisionIcon from '@atlaskit/icon/core/migration/decision--editor-decision';
19
- import EmojiIcon from '@atlaskit/icon/core/migration/emoji--editor-emoji';
20
- import GridIcon from '@atlaskit/icon/core/migration/grid--editor-table';
21
- import ImageIcon from '@atlaskit/icon/core/migration/image--editor-image';
22
- import LayoutTwoColumnsIcon from '@atlaskit/icon/core/migration/layout-two-columns--editor-layout-two-equal';
23
- import LinkIcon from '@atlaskit/icon/core/migration/link--editor-link';
24
- import MentionIcon from '@atlaskit/icon/core/migration/mention--editor-mention';
25
- import HorizontalRuleIcon from '@atlaskit/icon/core/migration/minus--editor-horizontal-rule';
26
- import QuotationMarkIcon from '@atlaskit/icon/core/migration/quotation-mark--quote';
27
- import ShowMoreHorizontalIcon from '@atlaskit/icon/core/migration/show-more-horizontal--editor-more';
28
- import InformationIcon from '@atlaskit/icon/core/migration/status-information--editor-info';
25
+ import HorizontalRuleIcon from '@atlaskit/icon/core/minus';
26
+ import QuotationMarkIcon from '@atlaskit/icon/core/quotation-mark';
27
+ import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
28
+ import InformationIcon from '@atlaskit/icon/core/status-information';
29
29
  import TaskIcon from '@atlaskit/icon/core/task';
30
30
  import CheckboxCheckedIconLegacy from '@atlaskit/icon/glyph/editor/task';
31
31
  import PlaceholderTextIcon from '@atlaskit/icon/glyph/media-services/text';
@@ -12,6 +12,7 @@ import { ToolbarButton, ToolbarTooltip, AddIcon, useToolbarUI } from '@atlaskit/
12
12
  import { fg } from '@atlaskit/platform-feature-flags';
13
13
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
14
14
  import InsertMenu, { DEFAULT_HEIGHT } from '../ElementBrowser/InsertMenu';
15
+ import { LINK_BUTTON_KEY } from './hooks/filterDropdownItems';
15
16
  import { useEmojiPickerPopup } from './hooks/useEmojiPickerPopup';
16
17
  import { useInsertButtonState } from './hooks/useInsertButtonState';
17
18
  import { useTableSelectorPopup } from './hooks/useTableSelectorPopup';
@@ -104,7 +105,7 @@ export var InsertButton = function InsertButton(_ref) {
104
105
  editorView.focus();
105
106
  }
106
107
  switch (item.value.name) {
107
- case 'link':
108
+ case LINK_BUTTON_KEY:
108
109
  api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$hyperlink = api.hyperlink) === null || _api$hyperlink === void 0 ? void 0 : _api$hyperlink.commands.showLinkToolbar(inputMethod));
109
110
  break;
110
111
  case 'table':
@@ -8,6 +8,7 @@ var ITEM_TO_BUTTON_MAP = {
8
8
  layout: 'layout',
9
9
  codeblock: 'codeBlock'
10
10
  };
11
+ export var LINK_BUTTON_KEY = 'link';
11
12
  var BREAKPOINT_ORDER = ['sm', 'md', 'lg', 'xl'];
12
13
 
13
14
  /**
@@ -24,6 +25,10 @@ function isButtonVisibleAtBreakpoint(buttonShowAt, currentBreakpoint) {
24
25
  export function filterDropdownItemsByBreakpoint(items, currentBreakpoint, toolbarConfig) {
25
26
  return items.filter(function (item) {
26
27
  var itemName = item.value.name;
28
+ // filter out link button because it's always visible on the toolbar
29
+ if (itemName === LINK_BUTTON_KEY) {
30
+ return false;
31
+ }
27
32
  var buttonKey = ITEM_TO_BUTTON_MAP[itemName];
28
33
  if (!buttonKey) {
29
34
  return true;
@@ -1,4 +1,5 @@
1
1
  import type { Breakpoint } from '@atlaskit/editor-toolbar';
2
2
  import type { ToolbarInsertBlockButtonsConfig } from '../../../types';
3
3
  import type { BlockMenuItem } from '../../ToolbarInsertBlock/create-items';
4
+ export declare const LINK_BUTTON_KEY = "link";
4
5
  export declare function filterDropdownItemsByBreakpoint(items: BlockMenuItem[], currentBreakpoint: Breakpoint | null, toolbarConfig: ToolbarInsertBlockButtonsConfig): BlockMenuItem[];
@@ -1,4 +1,5 @@
1
1
  import type { Breakpoint } from '@atlaskit/editor-toolbar';
2
2
  import type { ToolbarInsertBlockButtonsConfig } from '../../../types';
3
3
  import type { BlockMenuItem } from '../../ToolbarInsertBlock/create-items';
4
+ export declare const LINK_BUTTON_KEY = "link";
4
5
  export declare function filterDropdownItemsByBreakpoint(items: BlockMenuItem[], currentBreakpoint: Breakpoint | null, toolbarConfig: ToolbarInsertBlockButtonsConfig): BlockMenuItem[];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-insert-block",
3
- "version": "7.0.28",
3
+ "version": "7.0.29",
4
4
  "description": "Insert block plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -64,7 +64,7 @@
64
64
  "@atlaskit/icon-lab": "^5.12.0",
65
65
  "@atlaskit/platform-feature-flags": "^1.1.0",
66
66
  "@atlaskit/theme": "^21.0.0",
67
- "@atlaskit/tmp-editor-statsig": "^15.11.0",
67
+ "@atlaskit/tmp-editor-statsig": "^15.12.0",
68
68
  "@atlaskit/tokens": "^8.5.0",
69
69
  "@babel/runtime": "^7.0.0",
70
70
  "@emotion/react": "^11.7.1",