@atlaskit/editor-plugin-block-controls 2.21.12 → 2.22.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 (8) hide show
  1. package/CHANGELOG.md +15 -0
  2. package/dist/cjs/editor-commands/move-to-layout.js +42 -27
  3. package/dist/cjs/pm-plugins/utils/remove-from-source.js +1 -1
  4. package/dist/es2019/editor-commands/move-to-layout.js +42 -27
  5. package/dist/es2019/pm-plugins/utils/remove-from-source.js +1 -1
  6. package/dist/esm/editor-commands/move-to-layout.js +42 -27
  7. package/dist/esm/pm-plugins/utils/remove-from-source.js +1 -1
  8. package/package.json +5 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @atlaskit/editor-plugin-block-controls
2
2
 
3
+ ## 2.22.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#109549](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/109549)
8
+ [`d6907dac2c08d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d6907dac2c08d) -
9
+ ED-26300 Delete a layout section by delete the 2nd last column from the layout
10
+
11
+ ### Patch Changes
12
+
13
+ - [#111290](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/111290)
14
+ [`8a0749139717e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8a0749139717e) -
15
+ [ED-26392] Add exception handler for `.createChecked`
16
+ - Updated dependencies
17
+
3
18
  ## 2.21.12
4
19
 
5
20
  ### Patch Changes
package/dist/cjs/editor-commands/move-to-layout.js CHANGED
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.moveToLayout = void 0;
7
7
  var _analytics = require("@atlaskit/editor-common/analytics");
8
+ var _monitoring = require("@atlaskit/editor-common/monitoring");
8
9
  var _model = require("@atlaskit/editor-prosemirror/model");
9
10
  var _state = require("@atlaskit/editor-prosemirror/state");
10
11
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -36,7 +37,9 @@ var createNewLayout = function createNewLayout(schema, layoutContents) {
36
37
  var layoutSectionNode = layoutSection.createChecked(undefined, layoutContent);
37
38
  return layoutSectionNode;
38
39
  } catch (error) {
39
- // TODO analytics
40
+ (0, _monitoring.logException)(error, {
41
+ location: 'editor-plugin-block-controls/move-to-layout'
42
+ });
40
43
  }
41
44
  return null;
42
45
  };
@@ -92,21 +95,27 @@ var insertToDestinationNoWidthUpdate = function insertToDestinationNoWidthUpdate
92
95
  var _ref2 = tr.doc.type.schema.nodes || {},
93
96
  layoutColumn = _ref2.layoutColumn;
94
97
  var content = null;
95
- if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
96
- if (sourceContent instanceof _model.Fragment) {
97
- var _sourceFragment$first;
98
- var sourceFragment = sourceContent;
99
- content = layoutColumn.createChecked({
100
- width: 0
101
- }, (0, _checkFragment.isFragmentOfType)(sourceFragment, 'layoutColumn') ? (_sourceFragment$first = sourceFragment.firstChild) === null || _sourceFragment$first === void 0 ? void 0 : _sourceFragment$first.content : sourceFragment);
102
- }
103
- } else {
104
- if (sourceContent instanceof _model.Node) {
105
- var sourceNode = sourceContent;
106
- content = layoutColumn.createChecked({
107
- width: 0
108
- }, sourceNode.type.name === 'layoutColumn' ? sourceNode.content : sourceNode);
98
+ try {
99
+ if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
100
+ if (sourceContent instanceof _model.Fragment) {
101
+ var _sourceFragment$first;
102
+ var sourceFragment = sourceContent;
103
+ content = layoutColumn.createChecked({
104
+ width: 0
105
+ }, (0, _checkFragment.isFragmentOfType)(sourceFragment, 'layoutColumn') ? (_sourceFragment$first = sourceFragment.firstChild) === null || _sourceFragment$first === void 0 ? void 0 : _sourceFragment$first.content : sourceFragment);
106
+ }
107
+ } else {
108
+ if (sourceContent instanceof _model.Node) {
109
+ var sourceNode = sourceContent;
110
+ content = layoutColumn.createChecked({
111
+ width: 0
112
+ }, sourceNode.type.name === 'layoutColumn' ? sourceNode.content : sourceNode);
113
+ }
109
114
  }
115
+ } catch (error) {
116
+ (0, _monitoring.logException)(error, {
117
+ location: 'editor-plugin-block-controls/move-to-layout'
118
+ });
110
119
  }
111
120
  if (content) {
112
121
  tr.insert(to, content);
@@ -119,19 +128,25 @@ var insertToDestination = function insertToDestination(tr, to, sourceContent, to
119
128
  var _ref4 = tr.doc.type.schema.nodes || {},
120
129
  layoutColumn = _ref4.layoutColumn;
121
130
  var content = null;
122
- if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
123
- if (sourceContent instanceof _model.Fragment) {
124
- var _sourceContent$firstC;
125
- content = layoutColumn.createChecked({
126
- width: newColumnWidth
127
- }, (0, _checkFragment.isFragmentOfType)(sourceContent, 'layoutColumn') ? (_sourceContent$firstC = sourceContent.firstChild) === null || _sourceContent$firstC === void 0 ? void 0 : _sourceContent$firstC.content : sourceContent);
128
- }
129
- } else {
130
- if (sourceContent instanceof _model.Node) {
131
- content = layoutColumn.createChecked({
132
- width: newColumnWidth
133
- }, sourceContent.type.name === 'layoutColumn' ? sourceContent.content : sourceContent);
131
+ try {
132
+ if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
133
+ if (sourceContent instanceof _model.Fragment) {
134
+ var _sourceContent$firstC;
135
+ content = layoutColumn.createChecked({
136
+ width: newColumnWidth
137
+ }, (0, _checkFragment.isFragmentOfType)(sourceContent, 'layoutColumn') ? (_sourceContent$firstC = sourceContent.firstChild) === null || _sourceContent$firstC === void 0 ? void 0 : _sourceContent$firstC.content : sourceContent);
138
+ }
139
+ } else {
140
+ if (sourceContent instanceof _model.Node) {
141
+ content = layoutColumn.createChecked({
142
+ width: newColumnWidth
143
+ }, sourceContent.type.name === 'layoutColumn' ? sourceContent.content : sourceContent);
144
+ }
134
145
  }
146
+ } catch (error) {
147
+ (0, _monitoring.logException)(error, {
148
+ location: 'editor-plugin-block-controls/move-to-layout'
149
+ });
135
150
  }
136
151
  if (content) {
137
152
  tr.insert(to, content);
package/dist/cjs/pm-plugins/utils/remove-from-source.js CHANGED
@@ -31,7 +31,7 @@ var removeFromSource = exports.removeFromSource = function removeFromSource(tr,
31
31
 
32
32
  // Currently, we assume that the MIN_LAYOUT_COLUMN is set to 2.
33
33
  // This value may require an update when we introduce support for a single-column layout.
34
- if (sourceParent.childCount === 2 && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_DnD_remove_layout')) {
34
+ if (sourceParent.childCount === 2 && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_dnd_remove_layout')) {
35
35
  var _$from$parent$lastChi, _$from$parent$firstCh;
36
36
  var layoutContentFragment = $from.parentOffset === 0 ? _model.Fragment.from((_$from$parent$lastChi = $from.parent.lastChild) === null || _$from$parent$lastChi === void 0 ? void 0 : _$from$parent$lastChi.content) : _model.Fragment.from((_$from$parent$firstCh = $from.parent.firstChild) === null || _$from$parent$firstCh === void 0 ? void 0 : _$from$parent$firstCh.content);
37
37
  var parent = (0, _utils.findParentNodeClosestToPos)($from, function (node) {
package/dist/es2019/editor-commands/move-to-layout.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
2
+ import { logException } from '@atlaskit/editor-common/monitoring';
2
3
  import { Fragment, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
3
4
  import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
4
5
  import { fg } from '@atlaskit/platform-feature-flags';
@@ -31,7 +32,9 @@ const createNewLayout = (schema, layoutContents) => {
31
32
  const layoutSectionNode = layoutSection.createChecked(undefined, layoutContent);
32
33
  return layoutSectionNode;
33
34
  } catch (error) {
34
- // TODO analytics
35
+ logException(error, {
36
+ location: 'editor-plugin-block-controls/move-to-layout'
37
+ });
35
38
  }
36
39
  return null;
37
40
  };
@@ -88,21 +91,27 @@ const insertToDestinationNoWidthUpdate = (tr, to, sourceContent) => {
88
91
  layoutColumn
89
92
  } = tr.doc.type.schema.nodes || {};
90
93
  let content = null;
91
- if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
92
- if (sourceContent instanceof Fragment) {
93
- var _sourceFragment$first;
94
- const sourceFragment = sourceContent;
95
- content = layoutColumn.createChecked({
96
- width: 0
97
- }, isFragmentOfType(sourceFragment, 'layoutColumn') ? (_sourceFragment$first = sourceFragment.firstChild) === null || _sourceFragment$first === void 0 ? void 0 : _sourceFragment$first.content : sourceFragment);
98
- }
99
- } else {
100
- if (sourceContent instanceof PMNode) {
101
- const sourceNode = sourceContent;
102
- content = layoutColumn.createChecked({
103
- width: 0
104
- }, sourceNode.type.name === 'layoutColumn' ? sourceNode.content : sourceNode);
94
+ try {
95
+ if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
96
+ if (sourceContent instanceof Fragment) {
97
+ var _sourceFragment$first;
98
+ const sourceFragment = sourceContent;
99
+ content = layoutColumn.createChecked({
100
+ width: 0
101
+ }, isFragmentOfType(sourceFragment, 'layoutColumn') ? (_sourceFragment$first = sourceFragment.firstChild) === null || _sourceFragment$first === void 0 ? void 0 : _sourceFragment$first.content : sourceFragment);
102
+ }
103
+ } else {
104
+ if (sourceContent instanceof PMNode) {
105
+ const sourceNode = sourceContent;
106
+ content = layoutColumn.createChecked({
107
+ width: 0
108
+ }, sourceNode.type.name === 'layoutColumn' ? sourceNode.content : sourceNode);
109
+ }
105
110
  }
111
+ } catch (error) {
112
+ logException(error, {
113
+ location: 'editor-plugin-block-controls/move-to-layout'
114
+ });
106
115
  }
107
116
  if (content) {
108
117
  tr.insert(to, content);
@@ -117,19 +126,25 @@ const insertToDestination = (tr, to, sourceContent, toLayout, toLayoutPos) => {
117
126
  layoutColumn
118
127
  } = tr.doc.type.schema.nodes || {};
119
128
  let content = null;
120
- if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
121
- if (sourceContent instanceof Fragment) {
122
- var _sourceContent$firstC;
123
- content = layoutColumn.createChecked({
124
- width: newColumnWidth
125
- }, isFragmentOfType(sourceContent, 'layoutColumn') ? (_sourceContent$firstC = sourceContent.firstChild) === null || _sourceContent$firstC === void 0 ? void 0 : _sourceContent$firstC.content : sourceContent);
126
- }
127
- } else {
128
- if (sourceContent instanceof PMNode) {
129
- content = layoutColumn.createChecked({
130
- width: newColumnWidth
131
- }, sourceContent.type.name === 'layoutColumn' ? sourceContent.content : sourceContent);
129
+ try {
130
+ if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
131
+ if (sourceContent instanceof Fragment) {
132
+ var _sourceContent$firstC;
133
+ content = layoutColumn.createChecked({
134
+ width: newColumnWidth
135
+ }, isFragmentOfType(sourceContent, 'layoutColumn') ? (_sourceContent$firstC = sourceContent.firstChild) === null || _sourceContent$firstC === void 0 ? void 0 : _sourceContent$firstC.content : sourceContent);
136
+ }
137
+ } else {
138
+ if (sourceContent instanceof PMNode) {
139
+ content = layoutColumn.createChecked({
140
+ width: newColumnWidth
141
+ }, sourceContent.type.name === 'layoutColumn' ? sourceContent.content : sourceContent);
142
+ }
132
143
  }
144
+ } catch (error) {
145
+ logException(error, {
146
+ location: 'editor-plugin-block-controls/move-to-layout'
147
+ });
133
148
  }
134
149
  if (content) {
135
150
  tr.insert(to, content);
package/dist/es2019/pm-plugins/utils/remove-from-source.js CHANGED
@@ -25,7 +25,7 @@ export const removeFromSource = (tr, $from, to) => {
25
25
 
26
26
  // Currently, we assume that the MIN_LAYOUT_COLUMN is set to 2.
27
27
  // This value may require an update when we introduce support for a single-column layout.
28
- if (sourceParent.childCount === 2 && fg('platform_editor_advanced_layouts_DnD_remove_layout')) {
28
+ if (sourceParent.childCount === 2 && fg('platform_editor_advanced_layouts_dnd_remove_layout')) {
29
29
  var _$from$parent$lastChi, _$from$parent$firstCh;
30
30
  const layoutContentFragment = $from.parentOffset === 0 ? Fragment.from((_$from$parent$lastChi = $from.parent.lastChild) === null || _$from$parent$lastChi === void 0 ? void 0 : _$from$parent$lastChi.content) : Fragment.from((_$from$parent$firstCh = $from.parent.firstChild) === null || _$from$parent$firstCh === void 0 ? void 0 : _$from$parent$firstCh.content);
31
31
  const parent = findParentNodeClosestToPos($from, node => {
package/dist/esm/editor-commands/move-to-layout.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
2
+ import { logException } from '@atlaskit/editor-common/monitoring';
2
3
  import { Fragment, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
3
4
  import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
4
5
  import { fg } from '@atlaskit/platform-feature-flags';
@@ -30,7 +31,9 @@ var createNewLayout = function createNewLayout(schema, layoutContents) {
30
31
  var layoutSectionNode = layoutSection.createChecked(undefined, layoutContent);
31
32
  return layoutSectionNode;
32
33
  } catch (error) {
33
- // TODO analytics
34
+ logException(error, {
35
+ location: 'editor-plugin-block-controls/move-to-layout'
36
+ });
34
37
  }
35
38
  return null;
36
39
  };
@@ -86,21 +89,27 @@ var insertToDestinationNoWidthUpdate = function insertToDestinationNoWidthUpdate
86
89
  var _ref2 = tr.doc.type.schema.nodes || {},
87
90
  layoutColumn = _ref2.layoutColumn;
88
91
  var content = null;
89
- if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
90
- if (sourceContent instanceof Fragment) {
91
- var _sourceFragment$first;
92
- var sourceFragment = sourceContent;
93
- content = layoutColumn.createChecked({
94
- width: 0
95
- }, isFragmentOfType(sourceFragment, 'layoutColumn') ? (_sourceFragment$first = sourceFragment.firstChild) === null || _sourceFragment$first === void 0 ? void 0 : _sourceFragment$first.content : sourceFragment);
96
- }
97
- } else {
98
- if (sourceContent instanceof PMNode) {
99
- var sourceNode = sourceContent;
100
- content = layoutColumn.createChecked({
101
- width: 0
102
- }, sourceNode.type.name === 'layoutColumn' ? sourceNode.content : sourceNode);
92
+ try {
93
+ if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
94
+ if (sourceContent instanceof Fragment) {
95
+ var _sourceFragment$first;
96
+ var sourceFragment = sourceContent;
97
+ content = layoutColumn.createChecked({
98
+ width: 0
99
+ }, isFragmentOfType(sourceFragment, 'layoutColumn') ? (_sourceFragment$first = sourceFragment.firstChild) === null || _sourceFragment$first === void 0 ? void 0 : _sourceFragment$first.content : sourceFragment);
100
+ }
101
+ } else {
102
+ if (sourceContent instanceof PMNode) {
103
+ var sourceNode = sourceContent;
104
+ content = layoutColumn.createChecked({
105
+ width: 0
106
+ }, sourceNode.type.name === 'layoutColumn' ? sourceNode.content : sourceNode);
107
+ }
103
108
  }
109
+ } catch (error) {
110
+ logException(error, {
111
+ location: 'editor-plugin-block-controls/move-to-layout'
112
+ });
104
113
  }
105
114
  if (content) {
106
115
  tr.insert(to, content);
@@ -113,19 +122,25 @@ var insertToDestination = function insertToDestination(tr, to, sourceContent, to
113
122
  var _ref4 = tr.doc.type.schema.nodes || {},
114
123
  layoutColumn = _ref4.layoutColumn;
115
124
  var content = null;
116
- if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
117
- if (sourceContent instanceof Fragment) {
118
- var _sourceContent$firstC;
119
- content = layoutColumn.createChecked({
120
- width: newColumnWidth
121
- }, isFragmentOfType(sourceContent, 'layoutColumn') ? (_sourceContent$firstC = sourceContent.firstChild) === null || _sourceContent$firstC === void 0 ? void 0 : _sourceContent$firstC.content : sourceContent);
122
- }
123
- } else {
124
- if (sourceContent instanceof PMNode) {
125
- content = layoutColumn.createChecked({
126
- width: newColumnWidth
127
- }, sourceContent.type.name === 'layoutColumn' ? sourceContent.content : sourceContent);
125
+ try {
126
+ if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
127
+ if (sourceContent instanceof Fragment) {
128
+ var _sourceContent$firstC;
129
+ content = layoutColumn.createChecked({
130
+ width: newColumnWidth
131
+ }, isFragmentOfType(sourceContent, 'layoutColumn') ? (_sourceContent$firstC = sourceContent.firstChild) === null || _sourceContent$firstC === void 0 ? void 0 : _sourceContent$firstC.content : sourceContent);
132
+ }
133
+ } else {
134
+ if (sourceContent instanceof PMNode) {
135
+ content = layoutColumn.createChecked({
136
+ width: newColumnWidth
137
+ }, sourceContent.type.name === 'layoutColumn' ? sourceContent.content : sourceContent);
138
+ }
128
139
  }
140
+ } catch (error) {
141
+ logException(error, {
142
+ location: 'editor-plugin-block-controls/move-to-layout'
143
+ });
129
144
  }
130
145
  if (content) {
131
146
  tr.insert(to, content);
package/dist/esm/pm-plugins/utils/remove-from-source.js CHANGED
@@ -25,7 +25,7 @@ export var removeFromSource = function removeFromSource(tr, $from, to) {
25
25
 
26
26
  // Currently, we assume that the MIN_LAYOUT_COLUMN is set to 2.
27
27
  // This value may require an update when we introduce support for a single-column layout.
28
- if (sourceParent.childCount === 2 && fg('platform_editor_advanced_layouts_DnD_remove_layout')) {
28
+ if (sourceParent.childCount === 2 && fg('platform_editor_advanced_layouts_dnd_remove_layout')) {
29
29
  var _$from$parent$lastChi, _$from$parent$firstCh;
30
30
  var layoutContentFragment = $from.parentOffset === 0 ? Fragment.from((_$from$parent$lastChi = $from.parent.lastChild) === null || _$from$parent$lastChi === void 0 ? void 0 : _$from$parent$lastChi.content) : Fragment.from((_$from$parent$firstCh = $from.parent.firstChild) === null || _$from$parent$firstCh === void 0 ? void 0 : _$from$parent$firstCh.content);
31
31
  var parent = findParentNodeClosestToPos($from, function (node) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-block-controls",
3
- "version": "2.21.12",
3
+ "version": "2.22.0",
4
4
  "description": "Block controls plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -31,7 +31,7 @@
31
31
  },
32
32
  "dependencies": {
33
33
  "@atlaskit/adf-schema": "^46.1.0",
34
- "@atlaskit/editor-common": "^99.8.0",
34
+ "@atlaskit/editor-common": "^99.9.0",
35
35
  "@atlaskit/editor-plugin-accessibility-utils": "^1.3.0",
36
36
  "@atlaskit/editor-plugin-analytics": "^1.11.0",
37
37
  "@atlaskit/editor-plugin-editor-disabled": "^1.4.0",
@@ -41,14 +41,14 @@
41
41
  "@atlaskit/editor-prosemirror": "6.2.1",
42
42
  "@atlaskit/editor-shared-styles": "^3.2.0",
43
43
  "@atlaskit/editor-tables": "^2.8.0",
44
- "@atlaskit/icon": "^23.6.0",
44
+ "@atlaskit/icon": "^23.7.0",
45
45
  "@atlaskit/platform-feature-flags": "^1.0.0",
46
46
  "@atlaskit/pragmatic-drag-and-drop": "^1.5.0",
47
47
  "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
48
48
  "@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.2.0",
49
49
  "@atlaskit/primitives": "^13.4.0",
50
50
  "@atlaskit/theme": "^14.1.0",
51
- "@atlaskit/tmp-editor-statsig": "^2.42.0",
51
+ "@atlaskit/tmp-editor-statsig": "^2.43.0",
52
52
  "@atlaskit/tokens": "^3.3.0",
53
53
  "@atlaskit/tooltip": "^19.1.0",
54
54
  "@babel/runtime": "^7.0.0",
@@ -133,7 +133,7 @@
133
133
  "platform_editor_advanced_layouts_post_fix_patch_3": {
134
134
  "type": "boolean"
135
135
  },
136
- "platform_editor_advanced_layouts_DnD_remove_layout": {
136
+ "platform_editor_advanced_layouts_dnd_remove_layout": {
137
137
  "type": "boolean"
138
138
  },
139
139
  "platform_editor_dnd_update_drag_start_target": {