@atlaskit/editor-plugin-block-menu 1.0.10 → 1.0.11

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 1.0.11
+
+### Patch Changes
+
+- [`fcef7ff2e1083`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fcef7ff2e1083) -
+  Split unsupported content when converting to codeblock
+- [`1754f5027f568`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1754f5027f568) -
+  Fix missing copy link on table node
+- Updated dependencies
+
 ## 1.0.10
 
 ### Patch Changes

package/dist/cjs/editor-commands/transforms/container-transforms.js

@@ -82,6 +82,16 @@ var transformContainerNode = exports.transformContainerNode = function transform
 
   // Transform container to block type - unwrap and convert content
   if ((0, _utils.isBlockNodeType)(targetNodeType)) {
+    // special case container to codeblock
+    if (targetNodeType.name === 'codeBlock') {
+      return transformBetweenContainerTypes({
+        tr: tr,
+        sourceNode: sourceNode,
+        sourcePos: sourcePos,
+        targetNodeType: targetNodeType,
+        targetAttrs: targetAttrs
+      });
+    }
     return unwrapAndConvertToBlockType({
       tr: tr,
       sourceNode: sourceNode,
@@ -274,18 +284,29 @@ var transformBetweenContainerTypes = exports.transformBetweenContainerTypes = fu
     targetNodeType = context.targetNodeType,
     targetAttrs = context.targetAttrs;
 
+  // Special handling for codeBlock target
+  if (targetNodeType.name === 'codeBlock') {
+    var _contentSplits = splitContentForCodeBlock(sourceNode, targetNodeType, targetAttrs, tr.doc.type.schema);
+    return applySplitsToTransaction(tr, sourcePos, sourceNode.nodeSize, _contentSplits);
+  }
+
   // Get content validation for target container type
   var isContentSupported = (0, _utils.getContentSupportChecker)(targetNodeType);
 
   // Process content and collect splits
   var contentSplits = splitContentAroundUnsupportedBlocks(sourceNode, isContentSupported, targetNodeType, targetAttrs, tr.doc.type.schema);
+  return applySplitsToTransaction(tr, sourcePos, sourceNode.nodeSize, contentSplits);
+};
 
-  // Replace the original node with the first split
+/**
+ * Apply content splits to transaction - shared utility for replacing and inserting splits
+ */
+var applySplitsToTransaction = function applySplitsToTransaction(tr, sourcePos, sourceNodeSize, contentSplits) {
   var insertPos = sourcePos;
   contentSplits.forEach(function (splitNode, index) {
     if (index === 0) {
       // Replace the original node with the first split
-      tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, splitNode);
+      tr.replaceWith(sourcePos, sourcePos + sourceNodeSize, splitNode);
       insertPos = sourcePos + splitNode.nodeSize;
     } else {
       // Insert additional splits after
@@ -296,18 +317,75 @@ var transformBetweenContainerTypes = exports.transformBetweenContainerTypes = fu
   return tr;
 };
 
+/**
+ * Split content for codeBlock transformation, creating codeBlocks for text content
+ * and preserving unsupported blocks (like tables) separately
+ */
+var splitContentForCodeBlock = function splitContentForCodeBlock(sourceNode, targetNodeType, targetAttrs, schema) {
+  var _sourceNode$attrs3;
+  var splits = [];
+  var children = sourceNode.content.content;
+  var currentTextContent = [];
+
+  // Handle expand title - add as first text if source is expand with title
+  if (sourceNode.type.name === 'expand' && (_sourceNode$attrs3 = sourceNode.attrs) !== null && _sourceNode$attrs3 !== void 0 && _sourceNode$attrs3.title) {
+    currentTextContent.push(sourceNode.attrs.title);
+  }
+  var flushCurrentCodeBlock = function flushCurrentCodeBlock() {
+    if (currentTextContent.length > 0) {
+      var codeText = currentTextContent.join('\n');
+      var codeBlockNode = targetNodeType.create(targetAttrs, schema.text(codeText));
+      splits.push(codeBlockNode);
+      currentTextContent = [];
+    }
+  };
+  var isCodeBlockCompatible = function isCodeBlockCompatible(node) {
+    // Only text blocks (paragraph, heading) can be converted to codeBlock text
+    return node.isTextblock || node.type.name === 'codeBlock';
+  };
+  children.forEach(function (childNode) {
+    if (isCodeBlockCompatible(childNode)) {
+      // Extract text content from compatible nodes
+      if (childNode.type.name === 'codeBlock') {
+        // If it's already a codeBlock, extract its text
+        currentTextContent.push(childNode.textContent);
+      } else if (childNode.isTextblock) {
+        // Extract text from text blocks (paragraphs, headings, etc.)
+        var text = childNode.textContent;
+        if (text.trim()) {
+          currentTextContent.push(text);
+        }
+      }
+    } else if ((0, _utils.isBlockNodeForExtraction)(childNode)) {
+      // Unsupported block node (table, etc.) - flush current codeBlock, add block, continue
+      flushCurrentCodeBlock();
+      splits.push(childNode);
+    } else {
+      // Other unsupported content - try to extract text if possible
+      var _text = childNode.textContent;
+      if (_text && _text.trim()) {
+        currentTextContent.push(_text);
+      }
+    }
+  });
+
+  // Flush any remaining text content as a codeBlock
+  flushCurrentCodeBlock();
+  return splits;
+};
+
 /**
  * Split content around unsupported block nodes, creating separate containers
  * for content before and after each unsupported block
  */
 var splitContentAroundUnsupportedBlocks = function splitContentAroundUnsupportedBlocks(sourceNode, isContentSupported, targetNodeType, targetAttrs, schema) {
-  var _sourceNode$attrs3;
+  var _sourceNode$attrs4;
   var splits = [];
   var children = sourceNode.content.content;
   var currentContainerContent = [];
 
   // Handle expand title - add as first paragraph if source is expand with title
-  if (sourceNode.type.name === 'expand' && (_sourceNode$attrs3 = sourceNode.attrs) !== null && _sourceNode$attrs3 !== void 0 && _sourceNode$attrs3.title) {
+  if (sourceNode.type.name === 'expand' && (_sourceNode$attrs4 = sourceNode.attrs) !== null && _sourceNode$attrs4 !== void 0 && _sourceNode$attrs4.title) {
     var titleParagraph = schema.nodes.paragraph.create({}, schema.text(sourceNode.attrs.title));
     currentContainerContent.push(titleParagraph);
   }

package/dist/cjs/ui/utils/isNestedNode.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isNestedNode = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _editorTables = require("@atlaskit/editor-tables");
 /**
  * Determines if a node is nested (not at top-level) based on its depth and context.
  *
@@ -37,6 +38,11 @@ var isNestedNode = exports.isNestedNode = function isNestedNode(selection) {
     return true;
   }
 
+  // Special case for table selection
+  if (selection instanceof _editorTables.CellSelection) {
+    return depth > 3;
+  }
+
   // Check parent node type for depth 2-3
   var parentNode = $from.node(depth - 1);
   if (!parentNode) {

package/dist/es2019/editor-commands/transforms/container-transforms.js

@@ -76,6 +76,16 @@ export const transformContainerNode = ({
 
   // Transform container to block type - unwrap and convert content
   if (isBlockNodeType(targetNodeType)) {
+    // special case container to codeblock
+    if (targetNodeType.name === 'codeBlock') {
+      return transformBetweenContainerTypes({
+        tr,
+        sourceNode,
+        sourcePos,
+        targetNodeType,
+        targetAttrs
+      });
+    }
     return unwrapAndConvertToBlockType({
       tr,
       sourceNode,
@@ -273,18 +283,29 @@ export const transformBetweenContainerTypes = context => {
     targetAttrs
   } = context;
 
+  // Special handling for codeBlock target
+  if (targetNodeType.name === 'codeBlock') {
+    const contentSplits = splitContentForCodeBlock(sourceNode, targetNodeType, targetAttrs, tr.doc.type.schema);
+    return applySplitsToTransaction(tr, sourcePos, sourceNode.nodeSize, contentSplits);
+  }
+
   // Get content validation for target container type
   const isContentSupported = getContentSupportChecker(targetNodeType);
 
   // Process content and collect splits
   const contentSplits = splitContentAroundUnsupportedBlocks(sourceNode, isContentSupported, targetNodeType, targetAttrs, tr.doc.type.schema);
+  return applySplitsToTransaction(tr, sourcePos, sourceNode.nodeSize, contentSplits);
+};
 
-  // Replace the original node with the first split
+/**
+ * Apply content splits to transaction - shared utility for replacing and inserting splits
+ */
+const applySplitsToTransaction = (tr, sourcePos, sourceNodeSize, contentSplits) => {
   let insertPos = sourcePos;
   contentSplits.forEach((splitNode, index) => {
     if (index === 0) {
       // Replace the original node with the first split
-      tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, splitNode);
+      tr.replaceWith(sourcePos, sourcePos + sourceNodeSize, splitNode);
       insertPos = sourcePos + splitNode.nodeSize;
     } else {
       // Insert additional splits after
@@ -295,18 +316,75 @@ export const transformBetweenContainerTypes = context => {
   return tr;
 };
 
+/**
+ * Split content for codeBlock transformation, creating codeBlocks for text content
+ * and preserving unsupported blocks (like tables) separately
+ */
+const splitContentForCodeBlock = (sourceNode, targetNodeType, targetAttrs, schema) => {
+  var _sourceNode$attrs3;
+  const splits = [];
+  const children = sourceNode.content.content;
+  let currentTextContent = [];
+
+  // Handle expand title - add as first text if source is expand with title
+  if (sourceNode.type.name === 'expand' && (_sourceNode$attrs3 = sourceNode.attrs) !== null && _sourceNode$attrs3 !== void 0 && _sourceNode$attrs3.title) {
+    currentTextContent.push(sourceNode.attrs.title);
+  }
+  const flushCurrentCodeBlock = () => {
+    if (currentTextContent.length > 0) {
+      const codeText = currentTextContent.join('\n');
+      const codeBlockNode = targetNodeType.create(targetAttrs, schema.text(codeText));
+      splits.push(codeBlockNode);
+      currentTextContent = [];
+    }
+  };
+  const isCodeBlockCompatible = node => {
+    // Only text blocks (paragraph, heading) can be converted to codeBlock text
+    return node.isTextblock || node.type.name === 'codeBlock';
+  };
+  children.forEach(childNode => {
+    if (isCodeBlockCompatible(childNode)) {
+      // Extract text content from compatible nodes
+      if (childNode.type.name === 'codeBlock') {
+        // If it's already a codeBlock, extract its text
+        currentTextContent.push(childNode.textContent);
+      } else if (childNode.isTextblock) {
+        // Extract text from text blocks (paragraphs, headings, etc.)
+        const text = childNode.textContent;
+        if (text.trim()) {
+          currentTextContent.push(text);
+        }
+      }
+    } else if (isBlockNodeForExtraction(childNode)) {
+      // Unsupported block node (table, etc.) - flush current codeBlock, add block, continue
+      flushCurrentCodeBlock();
+      splits.push(childNode);
+    } else {
+      // Other unsupported content - try to extract text if possible
+      const text = childNode.textContent;
+      if (text && text.trim()) {
+        currentTextContent.push(text);
+      }
+    }
+  });
+
+  // Flush any remaining text content as a codeBlock
+  flushCurrentCodeBlock();
+  return splits;
+};
+
 /**
  * Split content around unsupported block nodes, creating separate containers
  * for content before and after each unsupported block
  */
 const splitContentAroundUnsupportedBlocks = (sourceNode, isContentSupported, targetNodeType, targetAttrs, schema) => {
-  var _sourceNode$attrs3;
+  var _sourceNode$attrs4;
   const splits = [];
   const children = sourceNode.content.content;
   let currentContainerContent = [];
 
   // Handle expand title - add as first paragraph if source is expand with title
-  if (sourceNode.type.name === 'expand' && (_sourceNode$attrs3 = sourceNode.attrs) !== null && _sourceNode$attrs3 !== void 0 && _sourceNode$attrs3.title) {
+  if (sourceNode.type.name === 'expand' && (_sourceNode$attrs4 = sourceNode.attrs) !== null && _sourceNode$attrs4 !== void 0 && _sourceNode$attrs4.title) {
     const titleParagraph = schema.nodes.paragraph.create({}, schema.text(sourceNode.attrs.title));
     currentContainerContent.push(titleParagraph);
   }

package/dist/es2019/ui/utils/isNestedNode.js

@@ -1,4 +1,5 @@
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { CellSelection } from '@atlaskit/editor-tables';
 
 /**
  * Determines if a node is nested (not at top-level) based on its depth and context.
@@ -34,6 +35,11 @@ export const isNestedNode = selection => {
     return true;
   }
 
+  // Special case for table selection
+  if (selection instanceof CellSelection) {
+    return depth > 3;
+  }
+
   // Check parent node type for depth 2-3
   const parentNode = $from.node(depth - 1);
   if (!parentNode) {

package/dist/esm/editor-commands/transforms/container-transforms.js

@@ -75,6 +75,16 @@ export var transformContainerNode = function transformContainerNode(_ref2) {
 
   // Transform container to block type - unwrap and convert content
   if (isBlockNodeType(targetNodeType)) {
+    // special case container to codeblock
+    if (targetNodeType.name === 'codeBlock') {
+      return transformBetweenContainerTypes({
+        tr: tr,
+        sourceNode: sourceNode,
+        sourcePos: sourcePos,
+        targetNodeType: targetNodeType,
+        targetAttrs: targetAttrs
+      });
+    }
     return unwrapAndConvertToBlockType({
       tr: tr,
       sourceNode: sourceNode,
@@ -267,18 +277,29 @@ export var transformBetweenContainerTypes = function transformBetweenContainerTy
     targetNodeType = context.targetNodeType,
     targetAttrs = context.targetAttrs;
 
+  // Special handling for codeBlock target
+  if (targetNodeType.name === 'codeBlock') {
+    var _contentSplits = splitContentForCodeBlock(sourceNode, targetNodeType, targetAttrs, tr.doc.type.schema);
+    return applySplitsToTransaction(tr, sourcePos, sourceNode.nodeSize, _contentSplits);
+  }
+
   // Get content validation for target container type
   var isContentSupported = getContentSupportChecker(targetNodeType);
 
   // Process content and collect splits
   var contentSplits = splitContentAroundUnsupportedBlocks(sourceNode, isContentSupported, targetNodeType, targetAttrs, tr.doc.type.schema);
+  return applySplitsToTransaction(tr, sourcePos, sourceNode.nodeSize, contentSplits);
+};
 
-  // Replace the original node with the first split
+/**
+ * Apply content splits to transaction - shared utility for replacing and inserting splits
+ */
+var applySplitsToTransaction = function applySplitsToTransaction(tr, sourcePos, sourceNodeSize, contentSplits) {
   var insertPos = sourcePos;
   contentSplits.forEach(function (splitNode, index) {
     if (index === 0) {
       // Replace the original node with the first split
-      tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, splitNode);
+      tr.replaceWith(sourcePos, sourcePos + sourceNodeSize, splitNode);
       insertPos = sourcePos + splitNode.nodeSize;
     } else {
       // Insert additional splits after
@@ -289,18 +310,75 @@ export var transformBetweenContainerTypes = function transformBetweenContainerTy
   return tr;
 };
 
+/**
+ * Split content for codeBlock transformation, creating codeBlocks for text content
+ * and preserving unsupported blocks (like tables) separately
+ */
+var splitContentForCodeBlock = function splitContentForCodeBlock(sourceNode, targetNodeType, targetAttrs, schema) {
+  var _sourceNode$attrs3;
+  var splits = [];
+  var children = sourceNode.content.content;
+  var currentTextContent = [];
+
+  // Handle expand title - add as first text if source is expand with title
+  if (sourceNode.type.name === 'expand' && (_sourceNode$attrs3 = sourceNode.attrs) !== null && _sourceNode$attrs3 !== void 0 && _sourceNode$attrs3.title) {
+    currentTextContent.push(sourceNode.attrs.title);
+  }
+  var flushCurrentCodeBlock = function flushCurrentCodeBlock() {
+    if (currentTextContent.length > 0) {
+      var codeText = currentTextContent.join('\n');
+      var codeBlockNode = targetNodeType.create(targetAttrs, schema.text(codeText));
+      splits.push(codeBlockNode);
+      currentTextContent = [];
+    }
+  };
+  var isCodeBlockCompatible = function isCodeBlockCompatible(node) {
+    // Only text blocks (paragraph, heading) can be converted to codeBlock text
+    return node.isTextblock || node.type.name === 'codeBlock';
+  };
+  children.forEach(function (childNode) {
+    if (isCodeBlockCompatible(childNode)) {
+      // Extract text content from compatible nodes
+      if (childNode.type.name === 'codeBlock') {
+        // If it's already a codeBlock, extract its text
+        currentTextContent.push(childNode.textContent);
+      } else if (childNode.isTextblock) {
+        // Extract text from text blocks (paragraphs, headings, etc.)
+        var text = childNode.textContent;
+        if (text.trim()) {
+          currentTextContent.push(text);
+        }
+      }
+    } else if (isBlockNodeForExtraction(childNode)) {
+      // Unsupported block node (table, etc.) - flush current codeBlock, add block, continue
+      flushCurrentCodeBlock();
+      splits.push(childNode);
+    } else {
+      // Other unsupported content - try to extract text if possible
+      var _text = childNode.textContent;
+      if (_text && _text.trim()) {
+        currentTextContent.push(_text);
+      }
+    }
+  });
+
+  // Flush any remaining text content as a codeBlock
+  flushCurrentCodeBlock();
+  return splits;
+};
+
 /**
  * Split content around unsupported block nodes, creating separate containers
  * for content before and after each unsupported block
  */
 var splitContentAroundUnsupportedBlocks = function splitContentAroundUnsupportedBlocks(sourceNode, isContentSupported, targetNodeType, targetAttrs, schema) {
-  var _sourceNode$attrs3;
+  var _sourceNode$attrs4;
   var splits = [];
   var children = sourceNode.content.content;
   var currentContainerContent = [];
 
   // Handle expand title - add as first paragraph if source is expand with title
-  if (sourceNode.type.name === 'expand' && (_sourceNode$attrs3 = sourceNode.attrs) !== null && _sourceNode$attrs3 !== void 0 && _sourceNode$attrs3.title) {
+  if (sourceNode.type.name === 'expand' && (_sourceNode$attrs4 = sourceNode.attrs) !== null && _sourceNode$attrs4 !== void 0 && _sourceNode$attrs4.title) {
     var titleParagraph = schema.nodes.paragraph.create({}, schema.text(sourceNode.attrs.title));
     currentContainerContent.push(titleParagraph);
   }

package/dist/esm/ui/utils/isNestedNode.js

@@ -1,4 +1,5 @@
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { CellSelection } from '@atlaskit/editor-tables';
 
 /**
  * Determines if a node is nested (not at top-level) based on its depth and context.
@@ -32,6 +33,11 @@ export var isNestedNode = function isNestedNode(selection) {
     return true;
   }
 
+  // Special case for table selection
+  if (selection instanceof CellSelection) {
+    return depth > 3;
+  }
+
   // Check parent node type for depth 2-3
   var parentNode = $from.node(depth - 1);
   if (!parentNode) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "1.0.10",
+	"version": "1.0.11",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",