@atlaskit/editor-plugin-code-block 3.3.6 → 3.3.7

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-code-block
 
+## 3.3.7
+
+### Patch Changes
+
+- [`193f8c85e1a39`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/193f8c85e1a39) -
+  [ux] [ED-24635]
+
+  - Disable Turn into dropdown options when wrapping is not supported
+  - Update expand icon so that it can show disabled status
+  - Update Turn into icon to show active status when dropdown is open
+
+- Updated dependencies
+
 ## 3.3.6
 
 ### Patch Changes

package/dist/cjs/actions.js

@@ -156,7 +156,7 @@ function createInsertCodeBlockTransaction(_ref) {
     parentNodeType: parentNodeType,
     grandParentNodeType: grandParentNodeType,
     content: codeBlock.createAndFill()
-  }) && contentAllowedInCodeBlock(state);
+  }) && (0, _insert.contentAllowedInCodeBlock)(state);
   if (canInsertCodeBlock) {
     tr = (0, _transformToCodeBlock.transformToCodeBlockAction)(state, from);
   } else {
@@ -164,25 +164,6 @@ function createInsertCodeBlockTransaction(_ref) {
   }
   return tr;
 }
-
-/**
- * Check if the current selection contains any nodes that are not permitted
- * as codeBlock child nodes. Note that this allows paragraphs and inline nodes
- * as we extract their text content.
- */
-function contentAllowedInCodeBlock(state) {
-  var _state$selection = state.selection,
-    $from = _state$selection.$from,
-    $to = _state$selection.$to;
-  var isAllowedChild = true;
-  state.doc.nodesBetween($from.pos, $to.pos, function (node) {
-    if (!isAllowedChild) {
-      return false;
-    }
-    return isAllowedChild = node.type === state.schema.nodes.listItem || node.type === state.schema.nodes.bulletList || node.type === state.schema.nodes.orderedList || node.type === state.schema.nodes.paragraph || node.isInline || node.type === state.schema.nodes.panel || node.isText;
-  });
-  return isAllowedChild;
-}
 function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI) {
   return (0, _editorAnalytics.withAnalytics)(analyticsAPI, {
     action: _analytics.ACTION.INSERTED,

package/dist/es2019/actions.js

@@ -2,7 +2,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, MODE, PLATFORMS
 import { copyToClipboard } from '@atlaskit/editor-common/clipboard';
 import { codeBlockWrappedStates, isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
-import { shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
+import { contentAllowedInCodeBlock, shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType, isNodeSelection, removeParentNodeOfType, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -173,26 +173,6 @@ export function createInsertCodeBlockTransaction({
   }
   return tr;
 }
-
-/**
- * Check if the current selection contains any nodes that are not permitted
- * as codeBlock child nodes. Note that this allows paragraphs and inline nodes
- * as we extract their text content.
- */
-function contentAllowedInCodeBlock(state) {
-  const {
-    $from,
-    $to
-  } = state.selection;
-  let isAllowedChild = true;
-  state.doc.nodesBetween($from.pos, $to.pos, node => {
-    if (!isAllowedChild) {
-      return false;
-    }
-    return isAllowedChild = node.type === state.schema.nodes.listItem || node.type === state.schema.nodes.bulletList || node.type === state.schema.nodes.orderedList || node.type === state.schema.nodes.paragraph || node.isInline || node.type === state.schema.nodes.panel || node.isText;
-  });
-  return isAllowedChild;
-}
 export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI) {
   return withAnalytics(analyticsAPI, {
     action: ACTION.INSERTED,

package/dist/esm/actions.js

@@ -2,7 +2,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, MODE, PLATFORMS
 import { copyToClipboard } from '@atlaskit/editor-common/clipboard';
 import { codeBlockWrappedStates, isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
-import { shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
+import { contentAllowedInCodeBlock, shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType, isNodeSelection, removeParentNodeOfType, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -154,25 +154,6 @@ export function createInsertCodeBlockTransaction(_ref) {
   }
   return tr;
 }
-
-/**
- * Check if the current selection contains any nodes that are not permitted
- * as codeBlock child nodes. Note that this allows paragraphs and inline nodes
- * as we extract their text content.
- */
-function contentAllowedInCodeBlock(state) {
-  var _state$selection = state.selection,
-    $from = _state$selection.$from,
-    $to = _state$selection.$to;
-  var isAllowedChild = true;
-  state.doc.nodesBetween($from.pos, $to.pos, function (node) {
-    if (!isAllowedChild) {
-      return false;
-    }
-    return isAllowedChild = node.type === state.schema.nodes.listItem || node.type === state.schema.nodes.bulletList || node.type === state.schema.nodes.orderedList || node.type === state.schema.nodes.paragraph || node.isInline || node.type === state.schema.nodes.panel || node.isText;
-  });
-  return isAllowedChild;
-}
 export function insertCodeBlockWithAnalytics(inputMethod, analyticsAPI) {
   return withAnalytics(analyticsAPI, {
     action: ACTION.INSERTED,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block",
-	"version": "3.3.6",
+	"version": "3.3.7",
 	"description": "Code block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,7 +35,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.8.1",
 		"@atlaskit/code": "^15.5.0",
-		"@atlaskit/editor-common": "^88.0.0",
+		"@atlaskit/editor-common": "^88.1.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-composition": "^1.2.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",