@atlaskit/editor-plugin-selection-toolbar 1.4.0 → 1.5.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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-plugin-selection-toolbar
2
2
 
3
+ ## 1.5.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#173684](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/173684)
8
+ [`e022c83d84bd3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e022c83d84bd3) -
9
+ Fix errors caused by not checking for undefined annotation toolbar
10
+
3
11
  ## 1.4.0
4
12
 
5
13
  ### Minor Changes
@@ -145,13 +145,16 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
145
145
 
146
146
  // This flattens the groups passed into the floating toolbar into a single list of items
147
147
  for (var i = 0; i < resolved.length; i++) {
148
+ var _resolved$i;
148
149
  // add a seperator icon after each group except the last
149
- items.push.apply(items, (0, _toConsumableArray2.default)(resolved[i].items));
150
+ if (Array.isArray((_resolved$i = resolved[i]) === null || _resolved$i === void 0 ? void 0 : _resolved$i.items)) {
151
+ items.push.apply(items, (0, _toConsumableArray2.default)(resolved[i].items));
152
+ }
150
153
  if ((0, _experiments.editorExperiment)('contextual_formatting_toolbar', true)) {
151
154
  var shouldNotAddSeparator = false;
152
155
  if (resolved[i] && resolved[i + 1]) {
153
- var _resolved$i, _resolved, _resolved$i2, _resolved2;
154
- shouldNotAddSeparator = ((_resolved$i = resolved[i]) === null || _resolved$i === void 0 ? void 0 : _resolved$i.pluginName) === 'textColor' && ((_resolved = resolved[i + 1]) === null || _resolved === void 0 ? void 0 : _resolved.pluginName) === 'highlight' || ((_resolved$i2 = resolved[i]) === null || _resolved$i2 === void 0 ? void 0 : _resolved$i2.pluginName) === 'alignment' && ((_resolved2 = resolved[i + 1]) === null || _resolved2 === void 0 ? void 0 : _resolved2.pluginName) === 'toolbarListsIndentation';
156
+ var _resolved$i2, _resolved, _resolved$i3, _resolved2;
157
+ shouldNotAddSeparator = ((_resolved$i2 = resolved[i]) === null || _resolved$i2 === void 0 ? void 0 : _resolved$i2.pluginName) === 'textColor' && ((_resolved = resolved[i + 1]) === null || _resolved === void 0 ? void 0 : _resolved.pluginName) === 'highlight' || ((_resolved$i3 = resolved[i]) === null || _resolved$i3 === void 0 ? void 0 : _resolved$i3.pluginName) === 'alignment' && ((_resolved2 = resolved[i + 1]) === null || _resolved2 === void 0 ? void 0 : _resolved2.pluginName) === 'toolbarListsIndentation';
155
158
  }
156
159
  if (i !== resolved.length - 1 && !shouldNotAddSeparator) {
157
160
  items.push({
@@ -134,13 +134,16 @@ export const selectionToolbarPlugin = options => {
134
134
 
135
135
  // This flattens the groups passed into the floating toolbar into a single list of items
136
136
  for (let i = 0; i < resolved.length; i++) {
137
+ var _resolved$i;
137
138
  // add a seperator icon after each group except the last
138
- items.push(...resolved[i].items);
139
+ if (Array.isArray((_resolved$i = resolved[i]) === null || _resolved$i === void 0 ? void 0 : _resolved$i.items)) {
140
+ items.push(...resolved[i].items);
141
+ }
139
142
  if (editorExperiment('contextual_formatting_toolbar', true)) {
140
143
  let shouldNotAddSeparator = false;
141
144
  if (resolved[i] && resolved[i + 1]) {
142
- var _resolved$i, _resolved, _resolved$i2, _resolved2;
143
- shouldNotAddSeparator = ((_resolved$i = resolved[i]) === null || _resolved$i === void 0 ? void 0 : _resolved$i.pluginName) === 'textColor' && ((_resolved = resolved[i + 1]) === null || _resolved === void 0 ? void 0 : _resolved.pluginName) === 'highlight' || ((_resolved$i2 = resolved[i]) === null || _resolved$i2 === void 0 ? void 0 : _resolved$i2.pluginName) === 'alignment' && ((_resolved2 = resolved[i + 1]) === null || _resolved2 === void 0 ? void 0 : _resolved2.pluginName) === 'toolbarListsIndentation';
145
+ var _resolved$i2, _resolved, _resolved$i3, _resolved2;
146
+ shouldNotAddSeparator = ((_resolved$i2 = resolved[i]) === null || _resolved$i2 === void 0 ? void 0 : _resolved$i2.pluginName) === 'textColor' && ((_resolved = resolved[i + 1]) === null || _resolved === void 0 ? void 0 : _resolved.pluginName) === 'highlight' || ((_resolved$i3 = resolved[i]) === null || _resolved$i3 === void 0 ? void 0 : _resolved$i3.pluginName) === 'alignment' && ((_resolved2 = resolved[i + 1]) === null || _resolved2 === void 0 ? void 0 : _resolved2.pluginName) === 'toolbarListsIndentation';
144
147
  }
145
148
  if (i !== resolved.length - 1 && !shouldNotAddSeparator) {
146
149
  items.push({
@@ -138,13 +138,16 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(options) {
138
138
 
139
139
  // This flattens the groups passed into the floating toolbar into a single list of items
140
140
  for (var i = 0; i < resolved.length; i++) {
141
+ var _resolved$i;
141
142
  // add a seperator icon after each group except the last
142
- items.push.apply(items, _toConsumableArray(resolved[i].items));
143
+ if (Array.isArray((_resolved$i = resolved[i]) === null || _resolved$i === void 0 ? void 0 : _resolved$i.items)) {
144
+ items.push.apply(items, _toConsumableArray(resolved[i].items));
145
+ }
143
146
  if (editorExperiment('contextual_formatting_toolbar', true)) {
144
147
  var shouldNotAddSeparator = false;
145
148
  if (resolved[i] && resolved[i + 1]) {
146
- var _resolved$i, _resolved, _resolved$i2, _resolved2;
147
- shouldNotAddSeparator = ((_resolved$i = resolved[i]) === null || _resolved$i === void 0 ? void 0 : _resolved$i.pluginName) === 'textColor' && ((_resolved = resolved[i + 1]) === null || _resolved === void 0 ? void 0 : _resolved.pluginName) === 'highlight' || ((_resolved$i2 = resolved[i]) === null || _resolved$i2 === void 0 ? void 0 : _resolved$i2.pluginName) === 'alignment' && ((_resolved2 = resolved[i + 1]) === null || _resolved2 === void 0 ? void 0 : _resolved2.pluginName) === 'toolbarListsIndentation';
149
+ var _resolved$i2, _resolved, _resolved$i3, _resolved2;
150
+ shouldNotAddSeparator = ((_resolved$i2 = resolved[i]) === null || _resolved$i2 === void 0 ? void 0 : _resolved$i2.pluginName) === 'textColor' && ((_resolved = resolved[i + 1]) === null || _resolved === void 0 ? void 0 : _resolved.pluginName) === 'highlight' || ((_resolved$i3 = resolved[i]) === null || _resolved$i3 === void 0 ? void 0 : _resolved$i3.pluginName) === 'alignment' && ((_resolved2 = resolved[i + 1]) === null || _resolved2 === void 0 ? void 0 : _resolved2.pluginName) === 'toolbarListsIndentation';
148
151
  }
149
152
  if (i !== resolved.length - 1 && !shouldNotAddSeparator) {
150
153
  items.push({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-selection-toolbar",
3
- "version": "1.4.0",
3
+ "version": "1.5.0",
4
4
  "description": "@atlaskit/editor-plugin-selection-toolbar for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",