@atlaskit/editor-plugin-block-type 3.0.25 → 3.0.26

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 (5) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/dist/cjs/plugin/commands/delete-block-content.js +6 -2
  3. package/dist/es2019/plugin/commands/delete-block-content.js +6 -2
  4. package/dist/esm/plugin/commands/delete-block-content.js +6 -2
  5. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # @atlaskit/editor-plugin-block-type
2
2
 
3
+ ## 3.0.26
4
+
5
+ ### Patch Changes
6
+
7
+ - [#76093](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/76093) [`fc113e0c416f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fc113e0c416f) - ED-22243 handling of backspace for mediaGroup node nested in panel
8
+ - Updated dependencies
9
+
3
10
  ## 3.0.25
4
11
 
5
12
  ### Patch Changes
package/dist/cjs/plugin/commands/delete-block-content.js CHANGED
@@ -16,6 +16,9 @@ var isSelectedNodeSoleDecisionItem = function isSelectedNodeSoleDecisionItem(sta
16
16
  var decisionList = (_findParentNodeOfType = (0, _utils.findParentNodeOfType)([state.schema.nodes.decisionList])(state.selection)) === null || _findParentNodeOfType === void 0 ? void 0 : _findParentNodeOfType.node;
17
17
  return (decisionList === null || decisionList === void 0 ? void 0 : decisionList.childCount) === 1;
18
18
  };
19
+ var isSelectedNodeMediaGroup = function isSelectedNodeMediaGroup(state) {
20
+ return Boolean(state.selection instanceof _state.NodeSelection && state.selection.node.type.name === 'media' && state.selection.$head.parent.type.name === 'mediaGroup');
21
+ };
19
22
 
20
23
  /**
21
24
  * Prevent removing the block when deleting block content
@@ -46,11 +49,12 @@ function deleteBlockContent(isNodeAWrappingBlockNode) {
46
49
  if (!selectionCrossesWrappingBlockNode) {
47
50
  return false;
48
51
  }
49
- var decisionIsInsidePanel = (0, _utils.hasParentNodeOfType)([state.schema.nodes.panel])(state.selection);
52
+ var isParentNodeOfTypePanel = (0, _utils.hasParentNodeOfType)([state.schema.nodes.panel])(state.selection);
50
53
 
51
54
  // If decision is inside panel and the decision list have only one decision item which is selected,
52
55
  // delete the whole decision list.
53
- if (decisionIsInsidePanel && isSelectedNodeSoleDecisionItem(state)) {
56
+ // Also, checks if selection is a mediaGroup node within a panel
57
+ if (isParentNodeOfTypePanel && (isSelectedNodeSoleDecisionItem(state) || isSelectedNodeMediaGroup(state))) {
54
58
  tr.setSelection(new _state.TextSelection(tr.doc.resolve($from.before()))).delete($from.before(), $from.after());
55
59
  } else {
56
60
  tr.delete($from.pos, $to.pos);
package/dist/es2019/plugin/commands/delete-block-content.js CHANGED
@@ -11,6 +11,9 @@ const isSelectedNodeSoleDecisionItem = state => {
11
11
  const decisionList = (_findParentNodeOfType = findParentNodeOfType([state.schema.nodes.decisionList])(state.selection)) === null || _findParentNodeOfType === void 0 ? void 0 : _findParentNodeOfType.node;
12
12
  return (decisionList === null || decisionList === void 0 ? void 0 : decisionList.childCount) === 1;
13
13
  };
14
+ const isSelectedNodeMediaGroup = state => {
15
+ return Boolean(state.selection instanceof NodeSelection && state.selection.node.type.name === 'media' && state.selection.$head.parent.type.name === 'mediaGroup');
16
+ };
14
17
 
15
18
  /**
16
19
  * Prevent removing the block when deleting block content
@@ -44,11 +47,12 @@ export function deleteBlockContent(isNodeAWrappingBlockNode) {
44
47
  if (!selectionCrossesWrappingBlockNode) {
45
48
  return false;
46
49
  }
47
- const decisionIsInsidePanel = hasParentNodeOfType([state.schema.nodes.panel])(state.selection);
50
+ const isParentNodeOfTypePanel = hasParentNodeOfType([state.schema.nodes.panel])(state.selection);
48
51
 
49
52
  // If decision is inside panel and the decision list have only one decision item which is selected,
50
53
  // delete the whole decision list.
51
- if (decisionIsInsidePanel && isSelectedNodeSoleDecisionItem(state)) {
54
+ // Also, checks if selection is a mediaGroup node within a panel
55
+ if (isParentNodeOfTypePanel && (isSelectedNodeSoleDecisionItem(state) || isSelectedNodeMediaGroup(state))) {
52
56
  tr.setSelection(new TextSelection(tr.doc.resolve($from.before()))).delete($from.before(), $from.after());
53
57
  } else {
54
58
  tr.delete($from.pos, $to.pos);
package/dist/esm/plugin/commands/delete-block-content.js CHANGED
@@ -11,6 +11,9 @@ var isSelectedNodeSoleDecisionItem = function isSelectedNodeSoleDecisionItem(sta
11
11
  var decisionList = (_findParentNodeOfType = findParentNodeOfType([state.schema.nodes.decisionList])(state.selection)) === null || _findParentNodeOfType === void 0 ? void 0 : _findParentNodeOfType.node;
12
12
  return (decisionList === null || decisionList === void 0 ? void 0 : decisionList.childCount) === 1;
13
13
  };
14
+ var isSelectedNodeMediaGroup = function isSelectedNodeMediaGroup(state) {
15
+ return Boolean(state.selection instanceof NodeSelection && state.selection.node.type.name === 'media' && state.selection.$head.parent.type.name === 'mediaGroup');
16
+ };
14
17
 
15
18
  /**
16
19
  * Prevent removing the block when deleting block content
@@ -41,11 +44,12 @@ export function deleteBlockContent(isNodeAWrappingBlockNode) {
41
44
  if (!selectionCrossesWrappingBlockNode) {
42
45
  return false;
43
46
  }
44
- var decisionIsInsidePanel = hasParentNodeOfType([state.schema.nodes.panel])(state.selection);
47
+ var isParentNodeOfTypePanel = hasParentNodeOfType([state.schema.nodes.panel])(state.selection);
45
48
 
46
49
  // If decision is inside panel and the decision list have only one decision item which is selected,
47
50
  // delete the whole decision list.
48
- if (decisionIsInsidePanel && isSelectedNodeSoleDecisionItem(state)) {
51
+ // Also, checks if selection is a mediaGroup node within a panel
52
+ if (isParentNodeOfTypePanel && (isSelectedNodeSoleDecisionItem(state) || isSelectedNodeMediaGroup(state))) {
49
53
  tr.setSelection(new TextSelection(tr.doc.resolve($from.before()))).delete($from.before(), $from.after());
50
54
  } else {
51
55
  tr.delete($from.pos, $to.pos);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-block-type",
3
- "version": "3.0.25",
3
+ "version": "3.0.26",
4
4
  "description": "BlockType plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -36,7 +36,7 @@
36
36
  },
37
37
  "dependencies": {
38
38
  "@atlaskit/adf-schema": "^35.5.1",
39
- "@atlaskit/editor-common": "^78.4.0",
39
+ "@atlaskit/editor-common": "^78.5.0",
40
40
  "@atlaskit/editor-plugin-analytics": "^1.0.0",
41
41
  "@atlaskit/editor-prosemirror": "3.0.0",
42
42
  "@atlaskit/editor-shared-styles": "^2.9.0",