@atlaskit/editor-plugin-block-controls 3.15.5 → 3.15.6

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.15.6
+
+### Patch Changes
+
+- [#161993](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/161993)
+  [`bd93cafe79061`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bd93cafe79061) -
+  [ED-27277] When quick insert is triggered by quick insert button and the selection is in code
+  block node, place slash in a new line after the node
+- Updated dependencies
+
 ## 3.15.5
 
 ### Patch Changes

package/dist/cjs/ui/quick-insert-button.js

@@ -207,7 +207,13 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
       if (!isSelectionInsideNode || (0, _documentChecks.isNonEditableBlock)(start, view)) {
         api.core.actions.execute((0, _editorCommands.createNewLine)(start));
       }
-      if (isSelectionInsideNode) {
+      var codeBlock = view.state.schema.nodes.codeBlock;
+      var selection = view.state.selection;
+      var codeBlockParentNode = (0, _utils.findParentNodeOfType)(codeBlock)(selection);
+      if (codeBlockParentNode && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_11')) {
+        // Slash command is not meant to be triggered inside code block, hence always insert slash in a new line following
+        api.core.actions.execute((0, _editorCommands.createNewLine)(codeBlockParentNode.pos));
+      } else if (isSelectionInsideNode) {
         // text or element with be deselected and the / added immediately after the paragraph
         // unless the selection is empty
         var currentSelection = view.state.selection;

package/dist/cjs/ui/utils/document-checks.js

@@ -5,9 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isSelectionInNode = exports.isNonEditableBlock = exports.isNestedNodeSelected = exports.isInTextSelection = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var isNestedNodeSelected = exports.isNestedNodeSelected = function isNestedNodeSelected(view) {
   var selection = view.state.selection;
-  return selection instanceof _state.NodeSelection && selection.$from.depth > 1;
+  return selection instanceof _state.NodeSelection && selection.$from.depth > ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_11') ? 0 : 1);
 };
 var isSelectionInNode = exports.isSelectionInNode = function isSelectionInNode(start, view) {
   var node = view.state.doc.nodeAt(start);

package/dist/es2019/ui/quick-insert-button.js

@@ -13,7 +13,7 @@ import { blockControlsMessages as messages } from '@atlaskit/editor-common/messa
 import { tableControlsSpacing } from '@atlaskit/editor-common/styles';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNode, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import AddIcon from '@atlaskit/icon/utility/add';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -197,7 +197,17 @@ export const TypeAheadControl = ({
       if (!isSelectionInsideNode || isNonEditableBlock(start, view)) {
         api.core.actions.execute(createNewLine(start));
       }
-      if (isSelectionInsideNode) {
+      const {
+        codeBlock
+      } = view.state.schema.nodes;
+      const {
+        selection
+      } = view.state;
+      const codeBlockParentNode = findParentNodeOfType(codeBlock)(selection);
+      if (codeBlockParentNode && fg('platform_editor_controls_patch_11')) {
+        // Slash command is not meant to be triggered inside code block, hence always insert slash in a new line following
+        api.core.actions.execute(createNewLine(codeBlockParentNode.pos));
+      } else if (isSelectionInsideNode) {
         // text or element with be deselected and the / added immediately after the paragraph
         // unless the selection is empty
         const currentSelection = view.state.selection;

package/dist/es2019/ui/utils/document-checks.js

@@ -1,7 +1,8 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 export const isNestedNodeSelected = view => {
   const selection = view.state.selection;
-  return selection instanceof NodeSelection && selection.$from.depth > 1;
+  return selection instanceof NodeSelection && selection.$from.depth > (fg('platform_editor_controls_patch_11') ? 0 : 1);
 };
 export const isSelectionInNode = (start, view) => {
   const node = view.state.doc.nodeAt(start);

package/dist/esm/ui/quick-insert-button.js

@@ -17,7 +17,7 @@ import { blockControlsMessages as messages } from '@atlaskit/editor-common/messa
 import { tableControlsSpacing } from '@atlaskit/editor-common/styles';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNode, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import AddIcon from '@atlaskit/icon/utility/add';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -201,7 +201,13 @@ export var TypeAheadControl = function TypeAheadControl(_ref) {
       if (!isSelectionInsideNode || isNonEditableBlock(start, view)) {
         api.core.actions.execute(createNewLine(start));
       }
-      if (isSelectionInsideNode) {
+      var codeBlock = view.state.schema.nodes.codeBlock;
+      var selection = view.state.selection;
+      var codeBlockParentNode = findParentNodeOfType(codeBlock)(selection);
+      if (codeBlockParentNode && fg('platform_editor_controls_patch_11')) {
+        // Slash command is not meant to be triggered inside code block, hence always insert slash in a new line following
+        api.core.actions.execute(createNewLine(codeBlockParentNode.pos));
+      } else if (isSelectionInsideNode) {
         // text or element with be deselected and the / added immediately after the paragraph
         // unless the selection is empty
         var currentSelection = view.state.selection;

package/dist/esm/ui/utils/document-checks.js

@@ -1,7 +1,8 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 export var isNestedNodeSelected = function isNestedNodeSelected(view) {
   var selection = view.state.selection;
-  return selection instanceof NodeSelection && selection.$from.depth > 1;
+  return selection instanceof NodeSelection && selection.$from.depth > (fg('platform_editor_controls_patch_11') ? 0 : 1);
 };
 export var isSelectionInNode = function isSelectionInNode(start, view) {
   var node = view.state.doc.nodeAt(start);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.15.5",
+	"version": "3.15.6",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^106.0.0",
+		"@atlaskit/editor-common": "^106.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
@@ -196,6 +196,9 @@
 		},
 		"dst-a11y__replace-anchor-with-link__editor-jenga": {
 			"type": "boolean"
+		},
+		"platform_editor_controls_patch_11": {
+			"type": "boolean"
 		}
 	}
 }