@atlaskit/editor-plugin-block-type 3.15.2 → 3.15.4

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 +15 -0
  2. package/dist/cjs/plugin/commands/delete-block-content.js +7 -6
  3. package/dist/es2019/plugin/commands/delete-block-content.js +7 -6
  4. package/dist/esm/plugin/commands/delete-block-content.js +7 -6
  5. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @atlaskit/editor-plugin-block-type
2
2
 
3
+ ## 3.15.4
4
+
5
+ ### Patch Changes
6
+
7
+ - [#145991](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/145991)
8
+ [`07586b8ad11ec`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/07586b8ad11ec) -
9
+ [ux] [ED-24900] This change handles deleting nested media groups inside blockquotes via the
10
+ backspace key.
11
+
12
+ ## 3.15.3
13
+
14
+ ### Patch Changes
15
+
16
+ - Updated dependencies
17
+
3
18
  ## 3.15.2
4
19
 
5
20
  ### Patch Changes
package/dist/cjs/plugin/commands/delete-block-content.js CHANGED
@@ -50,12 +50,13 @@ function deleteBlockContent(isNodeAWrappingBlockNode) {
50
50
  return false;
51
51
  }
52
52
  var isParentNodeOfTypePanel = (0, _utils.hasParentNodeOfType)([state.schema.nodes.panel])(state.selection);
53
-
54
- // If decision is inside panel and the decision list have only one decision item which is selected,
55
- // delete the whole decision list.
56
- // Also, checks if selection is a mediaGroup node within a panel
57
- if (isParentNodeOfTypePanel && (isSelectedNodeSoleDecisionItem(state) || isSelectedNodeMediaGroup(state))) {
58
- tr.setSelection(new _state.TextSelection(tr.doc.resolve($from.before()))).delete($from.before(), $from.after());
53
+ var isParentNodeOfTypeBlockQuote = (0, _utils.hasParentNodeOfType)([state.schema.nodes.blockquote])(state.selection);
54
+ if (isSelectedNodeMediaGroup(state) && (isParentNodeOfTypePanel || isParentNodeOfTypeBlockQuote)) {
55
+ return false;
56
+ }
57
+ if (isParentNodeOfTypePanel && isSelectedNodeSoleDecisionItem(state)) {
58
+ tr.setSelection(new _state.TextSelection(tr.doc.resolve($from.before())));
59
+ tr.delete($from.before(), $from.after());
59
60
  } else {
60
61
  tr.delete($from.pos, $to.pos);
61
62
  }
package/dist/es2019/plugin/commands/delete-block-content.js CHANGED
@@ -48,12 +48,13 @@ export function deleteBlockContent(isNodeAWrappingBlockNode) {
48
48
  return false;
49
49
  }
50
50
  const isParentNodeOfTypePanel = hasParentNodeOfType([state.schema.nodes.panel])(state.selection);
51
-
52
- // If decision is inside panel and the decision list have only one decision item which is selected,
53
- // delete the whole decision list.
54
- // Also, checks if selection is a mediaGroup node within a panel
55
- if (isParentNodeOfTypePanel && (isSelectedNodeSoleDecisionItem(state) || isSelectedNodeMediaGroup(state))) {
56
- tr.setSelection(new TextSelection(tr.doc.resolve($from.before()))).delete($from.before(), $from.after());
51
+ const isParentNodeOfTypeBlockQuote = hasParentNodeOfType([state.schema.nodes.blockquote])(state.selection);
52
+ if (isSelectedNodeMediaGroup(state) && (isParentNodeOfTypePanel || isParentNodeOfTypeBlockQuote)) {
53
+ return false;
54
+ }
55
+ if (isParentNodeOfTypePanel && isSelectedNodeSoleDecisionItem(state)) {
56
+ tr.setSelection(new TextSelection(tr.doc.resolve($from.before())));
57
+ tr.delete($from.before(), $from.after());
57
58
  } else {
58
59
  tr.delete($from.pos, $to.pos);
59
60
  }
package/dist/esm/plugin/commands/delete-block-content.js CHANGED
@@ -45,12 +45,13 @@ export function deleteBlockContent(isNodeAWrappingBlockNode) {
45
45
  return false;
46
46
  }
47
47
  var isParentNodeOfTypePanel = hasParentNodeOfType([state.schema.nodes.panel])(state.selection);
48
-
49
- // If decision is inside panel and the decision list have only one decision item which is selected,
50
- // delete the whole decision list.
51
- // Also, checks if selection is a mediaGroup node within a panel
52
- if (isParentNodeOfTypePanel && (isSelectedNodeSoleDecisionItem(state) || isSelectedNodeMediaGroup(state))) {
53
- tr.setSelection(new TextSelection(tr.doc.resolve($from.before()))).delete($from.before(), $from.after());
48
+ var isParentNodeOfTypeBlockQuote = hasParentNodeOfType([state.schema.nodes.blockquote])(state.selection);
49
+ if (isSelectedNodeMediaGroup(state) && (isParentNodeOfTypePanel || isParentNodeOfTypeBlockQuote)) {
50
+ return false;
51
+ }
52
+ if (isParentNodeOfTypePanel && isSelectedNodeSoleDecisionItem(state)) {
53
+ tr.setSelection(new TextSelection(tr.doc.resolve($from.before())));
54
+ tr.delete($from.before(), $from.after());
54
55
  } else {
55
56
  tr.delete($from.pos, $to.pos);
56
57
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-block-type",
3
- "version": "3.15.2",
3
+ "version": "3.15.4",
4
4
  "description": "BlockType plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -45,7 +45,7 @@
45
45
  "@atlaskit/prosemirror-input-rules": "^3.2.0",
46
46
  "@atlaskit/theme": "^13.0.0",
47
47
  "@atlaskit/tmp-editor-statsig": "*",
48
- "@atlaskit/tokens": "^1.61.0",
48
+ "@atlaskit/tokens": "^2.0.0",
49
49
  "@babel/runtime": "^7.0.0",
50
50
  "@emotion/react": "^11.7.1"
51
51
  },