@atlaskit/editor-plugin-block-menu 5.2.18 → 5.2.20

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.2.20
+
+### Patch Changes
+
+- [`65f1df43f39d7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/65f1df43f39d7) -
+  Add heading transform
+- Updated dependencies
+
+## 5.2.19
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 5.2.18
 
 ### Patch Changes

package/dist/cjs/editor-commands/transform-node-utils/steps/listToDecisionListStep.js

@@ -45,7 +45,7 @@ var listToDecisionListStep = exports.listToDecisionListStep = function listToDec
         if (child.type === paragraphType) {
           // paragraph may contain hard breaks etc.
           itemContent.push.apply(itemContent, (0, _toConsumableArray2.default)(child.children));
-        } else if (child.isText) {
+        } else if (child.isText || child.isInline) {
           itemContent.push(child);
         } else if (!(0, _nodeChecks.isListWithIndentation)(child.type.name, schema)) {
           unsupportedContent.push(child);

package/dist/cjs/editor-commands/transform-node-utils/steps/wrapMixedContentStep.js

@@ -8,6 +8,7 @@ exports.wrapMixedContentStep = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _types = require("../types");
+var _utils = require("../utils");
 /**
  * Determines if a node is a text node (heading or paragraph).
  * Text nodes can have their content converted to paragraphs when they can't be wrapped directly.
@@ -17,21 +18,6 @@ var isTextNode = function isTextNode(node) {
   return category === 'text';
 };
 
-/**
- * Converts a text node (heading, paragraph) to a paragraph preserving its inline content.
- * This is used when a text node can't be wrapped directly in the target container
- * (e.g., heading can't go in blockquote, so it becomes a paragraph).
- */
-var convertTextNodeToParagraph = function convertTextNodeToParagraph(node, schema) {
-  var _schema$nodes$paragra;
-  // If it's already a paragraph, return as-is
-  if (node.type.name === 'paragraph') {
-    return node;
-  }
-  // Convert heading (or other text node) to paragraph with same inline content
-  return (_schema$nodes$paragra = schema.nodes.paragraph.createAndFill({}, node.content)) !== null && _schema$nodes$paragra !== void 0 ? _schema$nodes$paragra : null;
-};
-
 /**
  * Determines if a node can be wrapped in the target container type.
  * Uses the schema's validContent to check if the target container can hold this node.
@@ -134,7 +120,7 @@ var wrapMixedContentStep = exports.wrapMixedContentStep = function wrapMixedCont
     } else if (isTextNode(node)) {
       // Text node (heading, paragraph) that can't be wrapped - convert to paragraph
       // Example: heading can't go in blockquote, so convert to paragraph with same content
-      var paragraph = convertTextNodeToParagraph(node, schema);
+      var paragraph = (0, _utils.convertTextNodeToParagraph)(node, schema);
       if (paragraph) {
         currentContainerContent.push(paragraph);
       }

package/dist/cjs/editor-commands/transform-node-utils/transform.js

@@ -45,7 +45,7 @@ var TRANSFORM_STEPS = {
   },
   text: {
     atomic: undefined,
-    container: [_wrapStep.wrapStep],
+    container: [_wrapMixedContentStep.wrapMixedContentStep],
     list: [_wrapIntoListStep.wrapIntoListStep],
     text: [_flattenStep.flattenStep, _applyTargetTextTypeStep.applyTargetTextTypeStep]
   }
@@ -58,6 +58,10 @@ var TRANSFORM_STEPS_OVERRIDE = {
     codeBlock: [_wrapTextToCodeblock.wrapTextToCodeblockStep],
     layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep]
   },
+  heading: {
+    codeBlock: [_wrapTextToCodeblock.wrapTextToCodeblockStep],
+    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep]
+  },
   panel: {
     layoutSection: [_unwrapStep.unwrapStep, _wrapIntoLayoutStep.wrapIntoLayoutStep],
     codeBlock: [_unwrapStep.unwrapStep, _flattenStep.flattenStep, _wrapStep.wrapStep],

package/dist/cjs/editor-commands/transform-node-utils/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.getBlockNodesInRange = exports.createTextContent = exports.convertNestedExpandToExpand = exports.convertExpandToNestedExpand = void 0;
+exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.getBlockNodesInRange = exports.createTextContent = exports.convertTextNodeToParagraph = exports.convertNestedExpandToExpand = exports.convertExpandToNestedExpand = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorTables = require("@atlaskit/editor-tables");
@@ -87,6 +87,21 @@ var convertExpandToNestedExpand = exports.convertExpandToNestedExpand = function
     title: ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.title) || ''
   }, node.content);
 };
+
+/**
+ * Converts a text node (heading, paragraph) to a paragraph preserving its inline content.
+ * This is used when a text node can't be wrapped directly in the target container
+ * (e.g., heading can't go in blockquote, so it becomes a paragraph).
+ */
+var convertTextNodeToParagraph = exports.convertTextNodeToParagraph = function convertTextNodeToParagraph(node, schema) {
+  var _schema$nodes$paragra;
+  // If it's already a paragraph, return as-is
+  if (node.type.name === 'paragraph') {
+    return node;
+  }
+  // Convert heading (or other text node) to paragraph with same inline content
+  return (_schema$nodes$paragra = schema.nodes.paragraph.createAndFill({}, node.content)) !== null && _schema$nodes$paragra !== void 0 ? _schema$nodes$paragra : null;
+};
 var getBlockNodesInRange = exports.getBlockNodesInRange = function getBlockNodesInRange(range) {
   if (range.startIndex === range.endIndex) {
     return [];

package/dist/cjs/editor-commands/transform-node-utils/wrapIntoListStep.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.wrapIntoListStep = void 0;
 var _nodeChecks = require("./nodeChecks");
+var _utils = require("./utils");
 var wrapIntoTaskOrDecisionList = function wrapIntoTaskOrDecisionList(nodes, targetNodeTypeName, schema) {
   var itemNodeType = targetNodeTypeName === 'taskList' ? schema.nodes.taskItem : schema.nodes.decisionItem;
   var inlineContent = nodes.flatMap(function (node) {
@@ -20,8 +21,15 @@ var wrapIntoTaskOrDecisionList = function wrapIntoTaskOrDecisionList(nodes, targ
   return outputNode ? [outputNode] : nodes;
 };
 var wrapIntoBulletOrOrderedList = function wrapIntoBulletOrOrderedList(nodes, targetNodeTypeName, schema) {
-  var listItemNode = schema.nodes.listItem.createAndFill({}, nodes);
-  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, listItemNode);
+  var listItemNodes = nodes.map(function (node) {
+    return schema.nodes.listItem.createAndFill({}, node.isTextblock ? (0, _utils.convertTextNodeToParagraph)(node, schema) : node);
+  }).filter(function (node) {
+    return node !== null;
+  });
+  if (listItemNodes.length === 0) {
+    return nodes;
+  }
+  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, listItemNodes);
   return outputNode ? [outputNode] : nodes;
 };
 

package/dist/es2019/editor-commands/transform-node-utils/steps/listToDecisionListStep.js

@@ -39,7 +39,7 @@ export const listToDecisionListStep = (nodes, context) => {
         if (child.type === paragraphType) {
           // paragraph may contain hard breaks etc.
           itemContent.push(...child.children);
-        } else if (child.isText) {
+        } else if (child.isText || child.isInline) {
           itemContent.push(child);
         } else if (!isListWithIndentation(child.type.name, schema)) {
           unsupportedContent.push(child);

package/dist/es2019/editor-commands/transform-node-utils/steps/wrapMixedContentStep.js

@@ -1,5 +1,6 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NODE_CATEGORY_BY_TYPE } from '../types';
+import { convertTextNodeToParagraph } from '../utils';
 
 /**
  * Determines if a node is a text node (heading or paragraph).
@@ -10,21 +11,6 @@ const isTextNode = node => {
   return category === 'text';
 };
 
-/**
- * Converts a text node (heading, paragraph) to a paragraph preserving its inline content.
- * This is used when a text node can't be wrapped directly in the target container
- * (e.g., heading can't go in blockquote, so it becomes a paragraph).
- */
-const convertTextNodeToParagraph = (node, schema) => {
-  var _schema$nodes$paragra;
-  // If it's already a paragraph, return as-is
-  if (node.type.name === 'paragraph') {
-    return node;
-  }
-  // Convert heading (or other text node) to paragraph with same inline content
-  return (_schema$nodes$paragra = schema.nodes.paragraph.createAndFill({}, node.content)) !== null && _schema$nodes$paragra !== void 0 ? _schema$nodes$paragra : null;
-};
-
 /**
  * Determines if a node can be wrapped in the target container type.
  * Uses the schema's validContent to check if the target container can hold this node.

package/dist/es2019/editor-commands/transform-node-utils/transform.js

@@ -40,7 +40,7 @@ const TRANSFORM_STEPS = {
   },
   text: {
     atomic: undefined,
-    container: [wrapStep],
+    container: [wrapMixedContentStep],
     list: [wrapIntoListStep],
     text: [flattenStep, applyTargetTextTypeStep]
   }
@@ -53,6 +53,10 @@ const TRANSFORM_STEPS_OVERRIDE = {
     codeBlock: [wrapTextToCodeblockStep],
     layoutSection: [wrapIntoLayoutStep]
   },
+  heading: {
+    codeBlock: [wrapTextToCodeblockStep],
+    layoutSection: [wrapIntoLayoutStep]
+  },
   panel: {
     layoutSection: [unwrapStep, wrapIntoLayoutStep],
     codeBlock: [unwrapStep, flattenStep, wrapStep],

package/dist/es2019/editor-commands/transform-node-utils/utils.js

@@ -82,6 +82,21 @@ export const convertExpandToNestedExpand = (node, schema) => {
     title: ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.title) || ''
   }, node.content);
 };
+
+/**
+ * Converts a text node (heading, paragraph) to a paragraph preserving its inline content.
+ * This is used when a text node can't be wrapped directly in the target container
+ * (e.g., heading can't go in blockquote, so it becomes a paragraph).
+ */
+export const convertTextNodeToParagraph = (node, schema) => {
+  var _schema$nodes$paragra;
+  // If it's already a paragraph, return as-is
+  if (node.type.name === 'paragraph') {
+    return node;
+  }
+  // Convert heading (or other text node) to paragraph with same inline content
+  return (_schema$nodes$paragra = schema.nodes.paragraph.createAndFill({}, node.content)) !== null && _schema$nodes$paragra !== void 0 ? _schema$nodes$paragra : null;
+};
 export const getBlockNodesInRange = range => {
   if (range.startIndex === range.endIndex) {
     return [];

package/dist/es2019/editor-commands/transform-node-utils/wrapIntoListStep.js

@@ -1,4 +1,5 @@
 import { isListWithTextContentOnly } from './nodeChecks';
+import { convertTextNodeToParagraph } from './utils';
 const wrapIntoTaskOrDecisionList = (nodes, targetNodeTypeName, schema) => {
   const itemNodeType = targetNodeTypeName === 'taskList' ? schema.nodes.taskItem : schema.nodes.decisionItem;
   const inlineContent = nodes.flatMap(node => {
@@ -14,8 +15,11 @@ const wrapIntoTaskOrDecisionList = (nodes, targetNodeTypeName, schema) => {
   return outputNode ? [outputNode] : nodes;
 };
 const wrapIntoBulletOrOrderedList = (nodes, targetNodeTypeName, schema) => {
-  const listItemNode = schema.nodes.listItem.createAndFill({}, nodes);
-  const outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, listItemNode);
+  const listItemNodes = nodes.map(node => schema.nodes.listItem.createAndFill({}, node.isTextblock ? convertTextNodeToParagraph(node, schema) : node)).filter(node => node !== null);
+  if (listItemNodes.length === 0) {
+    return nodes;
+  }
+  const outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, listItemNodes);
   return outputNode ? [outputNode] : nodes;
 };
 

package/dist/esm/editor-commands/transform-node-utils/steps/listToDecisionListStep.js

@@ -38,7 +38,7 @@ export var listToDecisionListStep = function listToDecisionListStep(nodes, conte
         if (child.type === paragraphType) {
           // paragraph may contain hard breaks etc.
           itemContent.push.apply(itemContent, _toConsumableArray(child.children));
-        } else if (child.isText) {
+        } else if (child.isText || child.isInline) {
           itemContent.push(child);
         } else if (!isListWithIndentation(child.type.name, schema)) {
           unsupportedContent.push(child);

package/dist/esm/editor-commands/transform-node-utils/steps/wrapMixedContentStep.js

@@ -1,6 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NODE_CATEGORY_BY_TYPE } from '../types';
+import { convertTextNodeToParagraph } from '../utils';
 
 /**
  * Determines if a node is a text node (heading or paragraph).
@@ -11,21 +12,6 @@ var isTextNode = function isTextNode(node) {
   return category === 'text';
 };
 
-/**
- * Converts a text node (heading, paragraph) to a paragraph preserving its inline content.
- * This is used when a text node can't be wrapped directly in the target container
- * (e.g., heading can't go in blockquote, so it becomes a paragraph).
- */
-var convertTextNodeToParagraph = function convertTextNodeToParagraph(node, schema) {
-  var _schema$nodes$paragra;
-  // If it's already a paragraph, return as-is
-  if (node.type.name === 'paragraph') {
-    return node;
-  }
-  // Convert heading (or other text node) to paragraph with same inline content
-  return (_schema$nodes$paragra = schema.nodes.paragraph.createAndFill({}, node.content)) !== null && _schema$nodes$paragra !== void 0 ? _schema$nodes$paragra : null;
-};
-
 /**
  * Determines if a node can be wrapped in the target container type.
  * Uses the schema's validContent to check if the target container can hold this node.

package/dist/esm/editor-commands/transform-node-utils/transform.js

@@ -40,7 +40,7 @@ var TRANSFORM_STEPS = {
   },
   text: {
     atomic: undefined,
-    container: [wrapStep],
+    container: [wrapMixedContentStep],
     list: [wrapIntoListStep],
     text: [flattenStep, applyTargetTextTypeStep]
   }
@@ -53,6 +53,10 @@ var TRANSFORM_STEPS_OVERRIDE = {
     codeBlock: [wrapTextToCodeblockStep],
     layoutSection: [wrapIntoLayoutStep]
   },
+  heading: {
+    codeBlock: [wrapTextToCodeblockStep],
+    layoutSection: [wrapIntoLayoutStep]
+  },
   panel: {
     layoutSection: [unwrapStep, wrapIntoLayoutStep],
     codeBlock: [unwrapStep, flattenStep, wrapStep],

package/dist/esm/editor-commands/transform-node-utils/utils.js

@@ -81,6 +81,21 @@ export var convertExpandToNestedExpand = function convertExpandToNestedExpand(no
     title: ((_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.title) || ''
   }, node.content);
 };
+
+/**
+ * Converts a text node (heading, paragraph) to a paragraph preserving its inline content.
+ * This is used when a text node can't be wrapped directly in the target container
+ * (e.g., heading can't go in blockquote, so it becomes a paragraph).
+ */
+export var convertTextNodeToParagraph = function convertTextNodeToParagraph(node, schema) {
+  var _schema$nodes$paragra;
+  // If it's already a paragraph, return as-is
+  if (node.type.name === 'paragraph') {
+    return node;
+  }
+  // Convert heading (or other text node) to paragraph with same inline content
+  return (_schema$nodes$paragra = schema.nodes.paragraph.createAndFill({}, node.content)) !== null && _schema$nodes$paragra !== void 0 ? _schema$nodes$paragra : null;
+};
 export var getBlockNodesInRange = function getBlockNodesInRange(range) {
   if (range.startIndex === range.endIndex) {
     return [];

package/dist/esm/editor-commands/transform-node-utils/wrapIntoListStep.js

@@ -1,4 +1,5 @@
 import { isListWithTextContentOnly } from './nodeChecks';
+import { convertTextNodeToParagraph } from './utils';
 var wrapIntoTaskOrDecisionList = function wrapIntoTaskOrDecisionList(nodes, targetNodeTypeName, schema) {
   var itemNodeType = targetNodeTypeName === 'taskList' ? schema.nodes.taskItem : schema.nodes.decisionItem;
   var inlineContent = nodes.flatMap(function (node) {
@@ -14,8 +15,15 @@ var wrapIntoTaskOrDecisionList = function wrapIntoTaskOrDecisionList(nodes, targ
   return outputNode ? [outputNode] : nodes;
 };
 var wrapIntoBulletOrOrderedList = function wrapIntoBulletOrOrderedList(nodes, targetNodeTypeName, schema) {
-  var listItemNode = schema.nodes.listItem.createAndFill({}, nodes);
-  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, listItemNode);
+  var listItemNodes = nodes.map(function (node) {
+    return schema.nodes.listItem.createAndFill({}, node.isTextblock ? convertTextNodeToParagraph(node, schema) : node);
+  }).filter(function (node) {
+    return node !== null;
+  });
+  if (listItemNodes.length === 0) {
+    return nodes;
+  }
+  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, listItemNodes);
   return outputNode ? [outputNode] : nodes;
 };
 

package/dist/types/editor-commands/transform-node-utils/utils.d.ts

@@ -16,6 +16,12 @@ export declare const convertNestedExpandToExpand: (node: PMNode, schema: Schema)
  * since expand cannot be a direct child of expand.
  */
 export declare const convertExpandToNestedExpand: (node: PMNode, schema: Schema) => PMNode | null;
+/**
+ * Converts a text node (heading, paragraph) to a paragraph preserving its inline content.
+ * This is used when a text node can't be wrapped directly in the target container
+ * (e.g., heading can't go in blockquote, so it becomes a paragraph).
+ */
+export declare const convertTextNodeToParagraph: (node: PMNode, schema: Schema) => PMNode | null;
 export declare const getBlockNodesInRange: (range: NodeRange) => PMNode[];
 /**
  * Iterates over a nodes children and extracting text content, removing all other inline content and converting

package/dist/types-ts4.5/editor-commands/transform-node-utils/utils.d.ts

@@ -16,6 +16,12 @@ export declare const convertNestedExpandToExpand: (node: PMNode, schema: Schema)
  * since expand cannot be a direct child of expand.
  */
 export declare const convertExpandToNestedExpand: (node: PMNode, schema: Schema) => PMNode | null;
+/**
+ * Converts a text node (heading, paragraph) to a paragraph preserving its inline content.
+ * This is used when a text node can't be wrapped directly in the target container
+ * (e.g., heading can't go in blockquote, so it becomes a paragraph).
+ */
+export declare const convertTextNodeToParagraph: (node: PMNode, schema: Schema) => PMNode | null;
 export declare const getBlockNodesInRange: (range: NodeRange) => PMNode[];
 /**
  * Iterates over a nodes children and extracting text content, removing all other inline content and converting

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.2.18",
+	"version": "5.2.20",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,10 +28,10 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/css": "^0.18.0",
+		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-controls": "^7.15.0",
+		"@atlaskit/editor-plugin-block-controls": "^7.17.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
@@ -43,13 +43,13 @@
 		"@atlaskit/icon": "^29.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
-		"@atlaskit/primitives": "^16.4.0",
+		"@atlaskit/primitives": "^17.0.0",
 		"@atlaskit/tmp-editor-statsig": "^16.0.0",
-		"@atlaskit/tokens": "^8.6.0",
+		"@atlaskit/tokens": "^9.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.46.0",
+		"@atlaskit/editor-common": "^110.47.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},