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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. package/CHANGELOG.md +19 -0
  2. package/dist/cjs/ui/ToolbarInsertBlock/dropdown-button.js +2 -2
  3. package/dist/cjs/ui/ToolbarInsertBlock/index.js +3 -2
  4. package/dist/cjs/ui/ToolbarInsertBlock/item.js +32 -38
  5. package/dist/cjs/ui/toolbar-components/InsertButton.js +2 -1
  6. package/dist/cjs/ui/toolbar-components/hooks/filterDropdownItems.js +6 -0
  7. package/dist/es2019/ui/ToolbarInsertBlock/dropdown-button.js +1 -1
  8. package/dist/es2019/ui/ToolbarInsertBlock/index.js +3 -2
  9. package/dist/es2019/ui/ToolbarInsertBlock/item.js +17 -23
  10. package/dist/es2019/ui/toolbar-components/InsertButton.js +2 -1
  11. package/dist/es2019/ui/toolbar-components/hooks/filterDropdownItems.js +5 -0
  12. package/dist/esm/ui/ToolbarInsertBlock/dropdown-button.js +1 -1
  13. package/dist/esm/ui/ToolbarInsertBlock/index.js +3 -2
  14. package/dist/esm/ui/ToolbarInsertBlock/item.js +17 -23
  15. package/dist/esm/ui/toolbar-components/InsertButton.js +2 -1
  16. package/dist/esm/ui/toolbar-components/hooks/filterDropdownItems.js +5 -0
  17. package/dist/types/ui/toolbar-components/hooks/filterDropdownItems.d.ts +1 -0
  18. package/dist/types-ts4.5/ui/toolbar-components/hooks/filterDropdownItems.d.ts +1 -0
  19. package/package.json +11 -11
package/CHANGELOG.md CHANGED
@@ -1,5 +1,24 @@
1
1
  # @atlaskit/editor-plugin-insert-block
2
2
 
3
+ ## 7.1.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`762b79e21f96a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/762b79e21f96a) -
8
+ Migrated and cleaned up legacy iconography usage.
9
+
10
+ ### Patch Changes
11
+
12
+ - Updated dependencies
13
+
14
+ ## 7.0.29
15
+
16
+ ### Patch Changes
17
+
18
+ - [`90abe9b926a6f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/90abe9b926a6f) -
19
+ Icon entrypoint migration
20
+ - Updated dependencies
21
+
3
22
  ## 7.0.28
4
23
 
5
24
  ### Patch Changes
package/dist/cjs/ui/ToolbarInsertBlock/dropdown-button.js CHANGED
@@ -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"
package/dist/cjs/ui/ToolbarInsertBlock/index.js CHANGED
@@ -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':
package/dist/cjs/ui/ToolbarInsertBlock/item.js CHANGED
@@ -12,25 +12,22 @@ 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
- var _task2 = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/task"));
32
- var _text = _interopRequireDefault(require("@atlaskit/icon/glyph/media-services/text"));
33
- var _status = _interopRequireDefault(require("@atlaskit/icon/glyph/status"));
34
31
  var _shallowEquals = require("./shallow-equals");
35
32
  /**
36
33
  * @jsxRuntime classic
@@ -77,8 +74,7 @@ var action = exports.action = mem(function (init) {
77
74
  return (0, _react2.jsx)(_task.default, {
78
75
  label: "",
79
76
  color: "currentColor",
80
- spacing: "spacious",
81
- LEGACY_fallbackIcon: _task2.default
77
+ spacing: "spacious"
82
78
  });
83
79
  },
84
80
  'aria-keyshortcuts': '[ ] Space'
@@ -91,7 +87,7 @@ var link = exports.link = mem(function (init) {
91
87
  disabled: init.disabled,
92
88
  name: 'link',
93
89
  shortcut: (0, _keymaps.tooltip)(_keymaps.addLink),
94
- Icon: _linkEditorLink.default,
90
+ Icon: _link.default,
95
91
  'aria-haspopup': init['aria-haspopup'],
96
92
  'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(_keymaps.addLink)
97
93
  });
@@ -102,7 +98,7 @@ var media = exports.media = mem(function (init) {
102
98
  tooltipDescription: init.tooltipDescription,
103
99
  disabled: init.disabled,
104
100
  name: 'media',
105
- Icon: _imageEditorImage.default
101
+ Icon: _image.default
106
102
  });
107
103
  });
108
104
  var imageUpload = exports.imageUpload = mem(function (init) {
@@ -111,7 +107,7 @@ var imageUpload = exports.imageUpload = mem(function (init) {
111
107
  tooltipDescription: init.tooltipDescription,
112
108
  disabled: init.disabled,
113
109
  name: 'image upload',
114
- Icon: _imageEditorImage.default
110
+ Icon: _image.default
115
111
  });
116
112
  });
117
113
  var mention = exports.mention = mem(function (init) {
@@ -120,7 +116,7 @@ var mention = exports.mention = mem(function (init) {
120
116
  tooltipDescription: init.tooltipDescription,
121
117
  disabled: init.disabled,
122
118
  name: 'mention',
123
- Icon: _mentionEditorMention.default,
119
+ Icon: _mention.default,
124
120
  shortcut: '@',
125
121
  'aria-haspopup': init['aria-haspopup'],
126
122
  'aria-keyshortcuts': 'Shift+2 Space'
@@ -132,7 +128,7 @@ var emoji = exports.emoji = mem(function (init) {
132
128
  tooltipDescription: init.tooltipDescription,
133
129
  disabled: init.disabled,
134
130
  name: 'emoji',
135
- Icon: _emojiEditorEmoji.default,
131
+ Icon: _emoji.default,
136
132
  shortcut: ':',
137
133
  'aria-haspopup': init['aria-haspopup'],
138
134
  'aria-keyshortcuts': 'Shift+;'
@@ -144,7 +140,7 @@ var table = exports.table = mem(function (init) {
144
140
  tooltipDescription: init.tooltipDescription,
145
141
  disabled: init.disabled,
146
142
  name: 'table',
147
- Icon: _gridEditorTable.default,
143
+ Icon: _grid.default,
148
144
  shortcut: (0, _keymaps.tooltip)(_keymaps.toggleTable),
149
145
  'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(_keymaps.toggleTable)
150
146
  });
@@ -170,7 +166,7 @@ var layout = exports.layout = mem(function (init) {
170
166
  tooltipDescription: init.tooltipDescription,
171
167
  disabled: init.disabled,
172
168
  name: 'layout',
173
- Icon: _layoutTwoColumnsEditorLayoutTwoEqual.default
169
+ Icon: _layoutTwoColumns.default
174
170
  });
175
171
  });
176
172
  var codeblock = exports.codeblock = mem(function (init) {
@@ -179,7 +175,7 @@ var codeblock = exports.codeblock = mem(function (init) {
179
175
  tooltipDescription: init.tooltipDescription,
180
176
  disabled: init.disabled,
181
177
  name: 'codeblock',
182
- Icon: _angleBracketsEditorCode.default,
178
+ Icon: _angleBrackets.default,
183
179
  shortcut: init.shortcut,
184
180
  'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(init.shortcut)
185
181
  });
@@ -190,7 +186,7 @@ var panel = exports.panel = mem(function (init) {
190
186
  tooltipDescription: init.tooltipDescription,
191
187
  disabled: init.disabled,
192
188
  name: 'panel',
193
- Icon: _statusInformationEditorInfo.default,
189
+ Icon: _statusInformation.default,
194
190
  shortcut: init.shortcut,
195
191
  'aria-keyshortcuts': (0, _keymaps.getAriaKeyshortcuts)(init.shortcut)
196
192
  });
@@ -201,7 +197,7 @@ var blockquote = exports.blockquote = mem(function (init) {
201
197
  tooltipDescription: init.tooltipDescription,
202
198
  disabled: init.disabled,
203
199
  name: 'blockquote',
204
- Icon: _quotationMarkQuote.default,
200
+ Icon: _quotationMark.default,
205
201
  shortcut: init.shortcut,
206
202
  'aria-keyshortcuts': 'Shift+. Space'
207
203
  });
@@ -212,7 +208,7 @@ var decision = exports.decision = mem(function (init) {
212
208
  tooltipDescription: init.tooltipDescription,
213
209
  disabled: init.disabled,
214
210
  name: 'decision',
215
- Icon: _decisionEditorDecision.default,
211
+ Icon: _decision.default,
216
212
  shortcut: '<>',
217
213
  'aria-keyshortcuts': 'Shift+, Shift+. Space'
218
214
  });
@@ -223,7 +219,7 @@ var horizontalrule = exports.horizontalrule = mem(function (init) {
223
219
  tooltipDescription: init.tooltipDescription,
224
220
  disabled: init.disabled,
225
221
  name: 'horizontalrule',
226
- Icon: _minusEditorHorizontalRule.default,
222
+ Icon: _minus.default,
227
223
  shortcut: '---',
228
224
  'aria-keyshortcuts': '- - -'
229
225
  });
@@ -235,7 +231,7 @@ var expand = exports.expand = mem(function (init) {
235
231
  disabled: init.disabled,
236
232
  name: 'expand',
237
233
  Icon: function Icon(iconProps) {
238
- return (0, _react2.jsx)(_chevronRightChevronRightCircle.default, {
234
+ return (0, _react2.jsx)(_chevronRight.default, {
239
235
  label: iconProps.label,
240
236
  size: "small"
241
237
  });
@@ -248,7 +244,7 @@ var date = exports.date = mem(function (init) {
248
244
  tooltipDescription: init.tooltipDescription,
249
245
  disabled: init.disabled,
250
246
  name: 'date',
251
- Icon: _calendarEditorDate.default,
247
+ Icon: _calendar.default,
252
248
  shortcut: '//',
253
249
  'aria-keyshortcuts': '/ / Enter'
254
250
  });
@@ -263,8 +259,7 @@ var placeholder = exports.placeholder = mem(function (init) {
263
259
  return (0, _react2.jsx)(_fieldText.default, {
264
260
  label: "",
265
261
  spacing: "spacious",
266
- color: "currentColor",
267
- LEGACY_fallbackIcon: _text.default
262
+ color: "currentColor"
268
263
  });
269
264
  }
270
265
  });
@@ -279,8 +274,7 @@ var status = exports.status = mem(function (init) {
279
274
  return (0, _react2.jsx)(_lozenge.default, {
280
275
  label: "",
281
276
  color: "currentColor",
282
- spacing: "spacious",
283
- LEGACY_fallbackIcon: _status.default
277
+ spacing: "spacious"
284
278
  });
285
279
  }
286
280
  });
@@ -300,7 +294,7 @@ var more = exports.more = mem(function (init) {
300
294
  disabled: init.disabled,
301
295
  name: 'macro',
302
296
  Icon: function Icon() {
303
- return (0, _react2.jsx)(_showMoreHorizontalEditorMore.default, {
297
+ return (0, _react2.jsx)(_showMoreHorizontal.default, {
304
298
  label: "",
305
299
  color: "currentColor"
306
300
  });
package/dist/cjs/ui/toolbar-components/InsertButton.js CHANGED
@@ -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':
package/dist/cjs/ui/toolbar-components/hooks/filterDropdownItems.js CHANGED
@@ -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;
package/dist/es2019/ui/ToolbarInsertBlock/dropdown-button.js CHANGED
@@ -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 =>
package/dist/es2019/ui/ToolbarInsertBlock/index.js CHANGED
@@ -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':
package/dist/es2019/ui/ToolbarInsertBlock/item.js CHANGED
@@ -11,25 +11,22 @@ 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
- import CheckboxCheckedIconLegacy from '@atlaskit/icon/glyph/editor/task';
31
- import PlaceholderTextIcon from '@atlaskit/icon/glyph/media-services/text';
32
- import StatusIconLegacy from '@atlaskit/icon/glyph/status';
33
30
  import { shallowEquals } from './shallow-equals';
34
31
  const from = init => ({
35
32
  content: init.content,
@@ -64,8 +61,7 @@ export const action = mem(init => {
64
61
  Icon: () => jsx(TaskIcon, {
65
62
  label: "",
66
63
  color: "currentColor",
67
- spacing: "spacious",
68
- LEGACY_fallbackIcon: CheckboxCheckedIconLegacy
64
+ spacing: "spacious"
69
65
  }),
70
66
  'aria-keyshortcuts': '[ ] Space'
71
67
  });
@@ -213,8 +209,7 @@ export const placeholder = mem(init => from({
213
209
  Icon: () => jsx(FieldTextIcon, {
214
210
  label: "",
215
211
  spacing: "spacious",
216
- color: "currentColor",
217
- LEGACY_fallbackIcon: PlaceholderTextIcon
212
+ color: "currentColor"
218
213
  })
219
214
  }));
220
215
  export const status = mem(init => from({
@@ -225,8 +220,7 @@ export const status = mem(init => from({
225
220
  Icon: () => jsx(LozengeIcon, {
226
221
  label: "",
227
222
  color: "currentColor",
228
- spacing: "spacious",
229
- LEGACY_fallbackIcon: StatusIconLegacy
223
+ spacing: "spacious"
230
224
  })
231
225
  }));
232
226
 
package/dist/es2019/ui/toolbar-components/InsertButton.js CHANGED
@@ -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':
package/dist/es2019/ui/toolbar-components/hooks/filterDropdownItems.js CHANGED
@@ -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;
package/dist/esm/ui/ToolbarInsertBlock/dropdown-button.js CHANGED
@@ -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) {
package/dist/esm/ui/ToolbarInsertBlock/index.js CHANGED
@@ -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':
package/dist/esm/ui/ToolbarInsertBlock/item.js CHANGED
@@ -11,25 +11,22 @@ 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
- import CheckboxCheckedIconLegacy from '@atlaskit/icon/glyph/editor/task';
31
- import PlaceholderTextIcon from '@atlaskit/icon/glyph/media-services/text';
32
- import StatusIconLegacy from '@atlaskit/icon/glyph/status';
33
30
  import { shallowEquals } from './shallow-equals';
34
31
  var from = function from(init) {
35
32
  return {
@@ -69,8 +66,7 @@ export var action = mem(function (init) {
69
66
  return jsx(TaskIcon, {
70
67
  label: "",
71
68
  color: "currentColor",
72
- spacing: "spacious",
73
- LEGACY_fallbackIcon: CheckboxCheckedIconLegacy
69
+ spacing: "spacious"
74
70
  });
75
71
  },
76
72
  'aria-keyshortcuts': '[ ] Space'
@@ -255,8 +251,7 @@ export var placeholder = mem(function (init) {
255
251
  return jsx(FieldTextIcon, {
256
252
  label: "",
257
253
  spacing: "spacious",
258
- color: "currentColor",
259
- LEGACY_fallbackIcon: PlaceholderTextIcon
254
+ color: "currentColor"
260
255
  });
261
256
  }
262
257
  });
@@ -271,8 +266,7 @@ export var status = mem(function (init) {
271
266
  return jsx(LozengeIcon, {
272
267
  label: "",
273
268
  color: "currentColor",
274
- spacing: "spacious",
275
- LEGACY_fallbackIcon: StatusIconLegacy
269
+ spacing: "spacious"
276
270
  });
277
271
  }
278
272
  });
package/dist/esm/ui/toolbar-components/InsertButton.js CHANGED
@@ -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':
package/dist/esm/ui/toolbar-components/hooks/filterDropdownItems.js CHANGED
@@ -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;
package/dist/types/ui/toolbar-components/hooks/filterDropdownItems.d.ts CHANGED
@@ -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/dist/types-ts4.5/ui/toolbar-components/hooks/filterDropdownItems.d.ts CHANGED
@@ -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.1.0",
4
4
  "description": "Insert block plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -30,28 +30,28 @@
30
30
  "atlaskit:src": "src/index.ts",
31
31
  "dependencies": {
32
32
  "@atlaskit/editor-plugin-analytics": "^6.2.0",
33
- "@atlaskit/editor-plugin-block-type": "^10.2.0",
33
+ "@atlaskit/editor-plugin-block-type": "^10.3.0",
34
34
  "@atlaskit/editor-plugin-code-block": "^8.1.0",
35
35
  "@atlaskit/editor-plugin-connectivity": "^6.0.0",
36
36
  "@atlaskit/editor-plugin-date": "^8.1.0",
37
37
  "@atlaskit/editor-plugin-emoji": "^7.7.0",
38
- "@atlaskit/editor-plugin-expand": "^7.4.0",
38
+ "@atlaskit/editor-plugin-expand": "^7.5.0",
39
39
  "@atlaskit/editor-plugin-extension": "^9.2.0",
40
40
  "@atlaskit/editor-plugin-feature-flags": "^5.0.0",
41
41
  "@atlaskit/editor-plugin-hyperlink": "^8.1.0",
42
42
  "@atlaskit/editor-plugin-image-upload": "^6.0.0",
43
43
  "@atlaskit/editor-plugin-layout": "^6.2.0",
44
- "@atlaskit/editor-plugin-media": "^8.5.0",
45
- "@atlaskit/editor-plugin-media-insert": "^14.0.0",
44
+ "@atlaskit/editor-plugin-media": "^8.6.0",
45
+ "@atlaskit/editor-plugin-media-insert": "^14.1.0",
46
46
  "@atlaskit/editor-plugin-mentions": "^8.2.0",
47
47
  "@atlaskit/editor-plugin-metrics": "^7.1.0",
48
- "@atlaskit/editor-plugin-panel": "^8.1.0",
48
+ "@atlaskit/editor-plugin-panel": "^8.2.0",
49
49
  "@atlaskit/editor-plugin-placeholder-text": "^7.1.0",
50
50
  "@atlaskit/editor-plugin-primary-toolbar": "^7.0.0",
51
51
  "@atlaskit/editor-plugin-quick-insert": "^6.1.0",
52
52
  "@atlaskit/editor-plugin-rule": "^6.1.0",
53
53
  "@atlaskit/editor-plugin-status": "^7.1.0",
54
- "@atlaskit/editor-plugin-table": "^15.5.0",
54
+ "@atlaskit/editor-plugin-table": "^15.6.0",
55
55
  "@atlaskit/editor-plugin-tasks-and-decisions": "^9.1.0",
56
56
  "@atlaskit/editor-plugin-toolbar": "^3.4.0",
57
57
  "@atlaskit/editor-plugin-type-ahead": "^6.5.0",
@@ -60,12 +60,12 @@
60
60
  "@atlaskit/editor-toolbar": "^0.18.0",
61
61
  "@atlaskit/editor-toolbar-model": "^0.2.0",
62
62
  "@atlaskit/emoji": "^69.9.0",
63
- "@atlaskit/icon": "^29.1.0",
63
+ "@atlaskit/icon": "^29.2.0",
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",
68
- "@atlaskit/tokens": "^8.5.0",
67
+ "@atlaskit/tmp-editor-statsig": "^15.12.0",
68
+ "@atlaskit/tokens": "^8.6.0",
69
69
  "@babel/runtime": "^7.0.0",
70
70
  "@emotion/react": "^11.7.1",
71
71
  "bind-event-listener": "^3.0.0",
@@ -74,7 +74,7 @@
74
74
  "react-virtualized": "^9.22.6"
75
75
  },
76
76
  "peerDependencies": {
77
- "@atlaskit/editor-common": "^110.44.0",
77
+ "@atlaskit/editor-common": "^110.45.0",
78
78
  "react": "^18.2.0",
79
79
  "react-dom": "^18.2.0",
80
80
  "react-intl-next": "npm:react-intl@^5.18.1"