@atlaskit/editor-plugin-block-type 3.15.3 → 3.15.5

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-type
 
+## 3.15.5
+
+### Patch Changes
+
+- [#146455](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/146455)
+  [`b692485729f1c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b692485729f1c) -
+  improve comment editor toolbar responsiveness
+- Updated dependencies
+
+## 3.15.4
+
+### Patch Changes
+
+- [#145991](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/145991)
+  [`07586b8ad11ec`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/07586b8ad11ec) -
+  [ux] [ED-24900] This change handles deleting nested media groups inside blockquotes via the
+  backspace key.
+
 ## 3.15.3
 
 ### Patch Changes

package/dist/cjs/plugin/commands/delete-block-content.js

@@ -50,12 +50,13 @@ function deleteBlockContent(isNodeAWrappingBlockNode) {
       return false;
     }
     var isParentNodeOfTypePanel = (0, _utils.hasParentNodeOfType)([state.schema.nodes.panel])(state.selection);
-
-    // If decision is inside panel and the decision list have only one decision item which is selected,
-    // delete the whole decision list.
-    // Also, checks if selection is a mediaGroup node within a panel
-    if (isParentNodeOfTypePanel && (isSelectedNodeSoleDecisionItem(state) || isSelectedNodeMediaGroup(state))) {
-      tr.setSelection(new _state.TextSelection(tr.doc.resolve($from.before()))).delete($from.before(), $from.after());
+    var isParentNodeOfTypeBlockQuote = (0, _utils.hasParentNodeOfType)([state.schema.nodes.blockquote])(state.selection);
+    if (isSelectedNodeMediaGroup(state) && (isParentNodeOfTypePanel || isParentNodeOfTypeBlockQuote)) {
+      return false;
+    }
+    if (isParentNodeOfTypePanel && isSelectedNodeSoleDecisionItem(state)) {
+      tr.setSelection(new _state.TextSelection(tr.doc.resolve($from.before())));
+      tr.delete($from.before(), $from.after());
     } else {
       tr.delete($from.pos, $to.pos);
     }

package/dist/cjs/plugin/index.js

@@ -114,6 +114,9 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
       disabled = _ref4.disabled,
       isToolbarReducedSpacing = _ref4.isToolbarReducedSpacing;
     var isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < _types.ToolbarSize.XXL : toolbarSize < _types.ToolbarSize.XL;
+    if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_responsive_fixes')) {
+      isSmall = toolbarSize < _types.ToolbarSize.XXL;
+    }
     return /*#__PURE__*/_react.default.createElement(_PrimaryToolbarComponent.PrimaryToolbarComponent, {
       isSmall: isSmall,
       disabled: disabled,

package/dist/es2019/plugin/commands/delete-block-content.js

@@ -48,12 +48,13 @@ export function deleteBlockContent(isNodeAWrappingBlockNode) {
       return false;
     }
     const isParentNodeOfTypePanel = hasParentNodeOfType([state.schema.nodes.panel])(state.selection);
-
-    // If decision is inside panel and the decision list have only one decision item which is selected,
-    // delete the whole decision list.
-    // Also, checks if selection is a mediaGroup node within a panel
-    if (isParentNodeOfTypePanel && (isSelectedNodeSoleDecisionItem(state) || isSelectedNodeMediaGroup(state))) {
-      tr.setSelection(new TextSelection(tr.doc.resolve($from.before()))).delete($from.before(), $from.after());
+    const isParentNodeOfTypeBlockQuote = hasParentNodeOfType([state.schema.nodes.blockquote])(state.selection);
+    if (isSelectedNodeMediaGroup(state) && (isParentNodeOfTypePanel || isParentNodeOfTypeBlockQuote)) {
+      return false;
+    }
+    if (isParentNodeOfTypePanel && isSelectedNodeSoleDecisionItem(state)) {
+      tr.setSelection(new TextSelection(tr.doc.resolve($from.before())));
+      tr.delete($from.before(), $from.after());
     } else {
       tr.delete($from.pos, $to.pos);
     }

package/dist/es2019/plugin/index.js

@@ -99,7 +99,10 @@ const blockTypePlugin = ({
     disabled,
     isToolbarReducedSpacing
   }) => {
-    const isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < ToolbarSize.XXL : toolbarSize < ToolbarSize.XL;
+    let isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < ToolbarSize.XXL : toolbarSize < ToolbarSize.XL;
+    if (fg('platform_editor_toolbar_responsive_fixes')) {
+      isSmall = toolbarSize < ToolbarSize.XXL;
+    }
     return /*#__PURE__*/React.createElement(PrimaryToolbarComponent, {
       isSmall: isSmall,
       disabled: disabled,

package/dist/esm/plugin/commands/delete-block-content.js

@@ -45,12 +45,13 @@ export function deleteBlockContent(isNodeAWrappingBlockNode) {
       return false;
     }
     var isParentNodeOfTypePanel = hasParentNodeOfType([state.schema.nodes.panel])(state.selection);
-
-    // If decision is inside panel and the decision list have only one decision item which is selected,
-    // delete the whole decision list.
-    // Also, checks if selection is a mediaGroup node within a panel
-    if (isParentNodeOfTypePanel && (isSelectedNodeSoleDecisionItem(state) || isSelectedNodeMediaGroup(state))) {
-      tr.setSelection(new TextSelection(tr.doc.resolve($from.before()))).delete($from.before(), $from.after());
+    var isParentNodeOfTypeBlockQuote = hasParentNodeOfType([state.schema.nodes.blockquote])(state.selection);
+    if (isSelectedNodeMediaGroup(state) && (isParentNodeOfTypePanel || isParentNodeOfTypeBlockQuote)) {
+      return false;
+    }
+    if (isParentNodeOfTypePanel && isSelectedNodeSoleDecisionItem(state)) {
+      tr.setSelection(new TextSelection(tr.doc.resolve($from.before())));
+      tr.delete($from.before(), $from.after());
     } else {
       tr.delete($from.pos, $to.pos);
     }

package/dist/esm/plugin/index.js

@@ -101,6 +101,9 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
       disabled = _ref4.disabled,
       isToolbarReducedSpacing = _ref4.isToolbarReducedSpacing;
     var isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < ToolbarSize.XXL : toolbarSize < ToolbarSize.XL;
+    if (fg('platform_editor_toolbar_responsive_fixes')) {
+      isSmall = toolbarSize < ToolbarSize.XXL;
+    }
     return /*#__PURE__*/React.createElement(PrimaryToolbarComponent, {
       isSmall: isSmall,
       disabled: disabled,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "3.15.3",
+	"version": "3.15.5",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,13 +34,13 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
-		"@atlaskit/editor-common": "^91.1.0",
+		"@atlaskit/editor-common": "^91.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/editor-shared-styles": "^3.0.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^22.18.0",
+		"@atlaskit/icon": "^22.19.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",
 		"@atlaskit/theme": "^13.0.0",
@@ -103,6 +103,9 @@
 		"editor_nest_media_and_codeblock_in_quotes_jira": {
 			"type": "boolean"
 		},
+		"platform_editor_toolbar_responsive_fixes": {
+			"type": "boolean"
+		},
 		"platform_editor_nest_in_quotes_adf_change": {
 			"type": "boolean"
 		}