@atlaskit/editor-plugin-block-menu 6.0.5 → 6.0.7

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

@@ -15,7 +15,6 @@ import { wrapTextToCodeblockStep } from './steps/wrapTextToCodeblock';
 import { getNodeName, NODE_CATEGORY_BY_TYPE, toNodeTypeValue } from './types';
 import { unwrapExpandStep } from './unwrapExpandStep';
 import { unwrapStep } from './unwrapStep';
-import { wrapIntoLayoutStep } from './wrapIntoLayoutStep';
 import { wrapIntoListStep } from './wrapIntoListStep';
 import { wrapStep } from './wrapStep';
 
@@ -65,15 +64,15 @@ var TRANSFORM_STEPS_OVERRIDE = {
   paragraph: {
     paragraph: null,
     codeBlock: [wrapTextToCodeblockStep],
-    layoutSection: [wrapIntoLayoutStep]
+    layoutSection: [wrapMixedContentStep]
   },
   heading: {
     codeBlock: [wrapTextToCodeblockStep],
-    layoutSection: [wrapIntoLayoutStep]
+    layoutSection: [wrapMixedContentStep]
   },
   panel: {
     panel: null,
-    layoutSection: [unwrapStep, wrapIntoLayoutStep],
+    layoutSection: [unwrapStep, wrapMixedContentStep],
     codeBlock: [unwrapStep, flattenStep, wrapStep],
     blockquote: [unwrapStep, wrapMixedContentStep],
     taskList: null,
@@ -85,7 +84,7 @@ var TRANSFORM_STEPS_OVERRIDE = {
     expand: null,
     panel: [unwrapExpandStep, wrapMixedContentStep],
     blockquote: [unwrapExpandStep, wrapMixedContentStep],
-    layoutSection: [unwrapExpandStep, wrapIntoLayoutStep],
+    layoutSection: [unwrapExpandStep, wrapMixedContentStep],
     paragraph: [unwrapExpandStep],
     codeBlock: null,
     heading: null
@@ -103,7 +102,7 @@ var TRANSFORM_STEPS_OVERRIDE = {
     blockquote: null,
     expand: [wrapStep],
     nestedExpand: [wrapStep],
-    layoutSection: [wrapIntoLayoutStep],
+    layoutSection: [wrapMixedContentStep],
     codeBlock: null,
     decisionList: [unwrapStep, wrapBlockquoteToDecisionListStep]
   },
@@ -121,34 +120,34 @@ var TRANSFORM_STEPS_OVERRIDE = {
     blockquote: [wrapStep],
     expand: [wrapStep],
     nestedExpand: [wrapStep],
-    layoutSection: [wrapIntoLayoutStep],
+    layoutSection: [wrapMixedContentStep],
     panel: [wrapStep],
     heading: null
   },
   bulletList: {
     bulletList: null,
     codeBlock: null,
-    layoutSection: [wrapIntoLayoutStep],
+    layoutSection: [wrapMixedContentStep],
     decisionList: [flattenListStep, listToDecisionListStep],
     heading: null
   },
   orderedList: {
     orderedList: null,
     codeBlock: null,
-    layoutSection: [wrapIntoLayoutStep],
+    layoutSection: [wrapMixedContentStep],
     decisionList: [flattenListStep, listToDecisionListStep],
     heading: null
   },
   taskList: {
     blockquote: null,
     codeBlock: null,
-    layoutSection: [wrapIntoLayoutStep],
+    layoutSection: [wrapMixedContentStep],
     decisionList: [flattenListStep, listToDecisionListStep],
     heading: null,
     taskList: null
   },
   table: {
-    layoutSection: [wrapIntoLayoutStep],
+    layoutSection: [wrapMixedContentStep],
     blockquote: null,
     panel: null,
     codeBlock: null,
@@ -158,13 +157,13 @@ var TRANSFORM_STEPS_OVERRIDE = {
     decisionList: null
   },
   mediaSingle: {
-    layoutSection: [wrapIntoLayoutStep],
+    layoutSection: [wrapMixedContentStep],
     codeBlock: null,
     decisionList: null,
     taskList: null
   },
   mediaGroup: {
-    layoutSection: [wrapIntoLayoutStep],
+    layoutSection: [wrapMixedContentStep],
     codeBlock: null,
     decisionList: null,
     bulletList: null,
@@ -176,10 +175,10 @@ var TRANSFORM_STEPS_OVERRIDE = {
     bulletList: [decisionListToListStep],
     orderedList: [decisionListToListStep],
     taskList: [decisionListToListStep],
-    layoutSection: [wrapIntoLayoutStep]
+    layoutSection: [wrapMixedContentStep]
   },
   blockCard: {
-    layoutSection: [wrapIntoLayoutStep],
+    layoutSection: [wrapMixedContentStep],
     blockquote: null,
     codeBlock: null,
     orderedList: null,
@@ -188,7 +187,7 @@ var TRANSFORM_STEPS_OVERRIDE = {
     decisionList: null
   },
   embedCard: {
-    layoutSection: [wrapIntoLayoutStep],
+    layoutSection: [wrapMixedContentStep],
     blockquote: null,
     panel: null,
     codeBlock: null,
@@ -198,7 +197,7 @@ var TRANSFORM_STEPS_OVERRIDE = {
     decisionList: null
   },
   extension: {
-    layoutSection: [wrapIntoLayoutStep],
+    layoutSection: [wrapMixedContentStep],
     codeBlock: null,
     decisionList: null,
     taskList: null,
@@ -206,7 +205,7 @@ var TRANSFORM_STEPS_OVERRIDE = {
     bulletList: null
   },
   bodiedExtension: {
-    layoutSection: [wrapIntoLayoutStep],
+    layoutSection: [wrapMixedContentStep],
     blockquote: null,
     expand: null,
     panel: null,
@@ -220,9 +219,7 @@ var TRANSFORM_STEPS_OVERRIDE = {
     // TODO: EDITOR-4140 - Implement multiple paragraphs/headings/codeblocks to heading transform
     heading: null,
     // TODO: EDITOR-4141 - Implement multiple codeblocks/headings to paragraph transform
-    paragraph: null,
-    // TODO: EDITOR-4138 - Implement multi content to layout transform
-    layoutSection: undefined
+    paragraph: null
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {

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

@@ -1,6 +1,16 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables';
+import { NODE_CATEGORY_BY_TYPE } from './types';
+
+/**
+ * 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.
+ */
+export var isTextNode = function isTextNode(node) {
+  var category = NODE_CATEGORY_BY_TYPE[node.type.name];
+  return category === 'text';
+};
 export var getSelectedNode = function getSelectedNode(selection) {
   if (selection instanceof NodeSelection) {
     return {

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

@@ -25,7 +25,5 @@ import type { TransformStep } from '../types';
  * @param nodes
  * @param context
  * @returns
- *
- * TODO: Lists with mixed types (e.g. bulletList with a taskItem) doesn't full flatten
  */
 export declare const flattenListStep: TransformStep;

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

@@ -5,17 +5,32 @@ import type { TransformStep } from '../types';
  * - Same-type containers break out as separate containers (preserved as-is)
  * - NestedExpands break out as regular expands (converted since nestedExpand can't exist outside expand)
  * - Container structures that can't be nested in target break out (not flattened)
- * - Text/list nodes that can't be wrapped are flattened and merged into the container
+ * - Text/list nodes that can't be wrapped are converted to paragraphs and merged into the container
  * - Atomic nodes (tables, media, macros) break out
  *
+ * Special handling for layouts:
+ * - Layout sections break out as separate layouts (preserved as-is, not wrapped)
+ * - Other nodes (including headings, paragraphs, lists) are wrapped into layout columns within a layout section
+ * - Layouts always require layoutColumns as children (never paragraphs directly)
+ * - Layout columns can contain most block content including headings, paragraphs, lists, etc.
+ *
+ * Edge case handling:
+ * - For regular containers: If all content breaks out (container → container transform with no
+ *   valid children), an empty container with a paragraph is created to ensure the target type exists
+ * - For layouts: Edge case handling is skipped because layouts require columns, not direct paragraphs.
+ *   If all content breaks out, only the broken-out nodes are returned (no empty layout created)
+ *
  * What can be wrapped depends on the target container's schema:
  * - expand → panel: tables break out, nestedExpands convert to expands and break out
- * - expand → blockquote: tables/media break out, nestedExpands convert to expands and break out
+ * - expand → blockquote: tables/media break out, nestedExpands convert to expands and break out, headings converted to paragraphs
  * - expand → expand: tables/media stay inside (expands can contain them)
+ * - multi → layoutSection: layout sections break out, headings/paragraphs/lists wrapped into layout columns
  *
  * Example: expand(p('a'), table(), p('b')) → panel: [panel(p('a')), table(), panel(p('b'))]
  * Example: expand(p('a'), panel(p('x')), p('b')) → panel: [panel(p('a')), panel(p('x')), panel(p('b'))]
  * Example: expand(p('a'), nestedExpand({title: 'inner'})(p('x')), p('b')) → panel: [panel(p('a')), expand({title: 'inner'})(p('x')), panel(p('b'))]
  * Example: expand(nestedExpand()(p())) → panel: [panel(), expand()(p())] (empty panel when all content breaks out)
+ * Example: [p('a'), layoutSection(...), p('b')] → layoutSection: [layoutSection(layoutColumn(p('a'))), layoutSection(...), layoutSection(layoutColumn(p('b')))]
+ * Example: [h1('heading'), p('para')] → layoutSection: [layoutSection(layoutColumn(h1('heading'), p('para')))] (headings stay as headings in layouts)
  */
 export declare const wrapMixedContentStep: TransformStep;

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

@@ -2,6 +2,11 @@ import type { NodeRange, Node as PMNode, Schema } from '@atlaskit/editor-prosemi
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { type ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 import type { NodeTypeName } from './types';
+/**
+ * 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.
+ */
+export declare const isTextNode: (node: PMNode) => boolean;
 export declare const getSelectedNode: (selection: Selection) => ContentNodeWithPos | undefined;
 export declare const getTargetNodeTypeNameInContext: (nodeTypeName: NodeTypeName | null, isNested?: boolean, parentNode?: PMNode) => NodeTypeName | null;
 /**

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

@@ -25,7 +25,5 @@ import type { TransformStep } from '../types';
  * @param nodes
  * @param context
  * @returns
- *
- * TODO: Lists with mixed types (e.g. bulletList with a taskItem) doesn't full flatten
  */
 export declare const flattenListStep: TransformStep;

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

@@ -5,17 +5,32 @@ import type { TransformStep } from '../types';
  * - Same-type containers break out as separate containers (preserved as-is)
  * - NestedExpands break out as regular expands (converted since nestedExpand can't exist outside expand)
  * - Container structures that can't be nested in target break out (not flattened)
- * - Text/list nodes that can't be wrapped are flattened and merged into the container
+ * - Text/list nodes that can't be wrapped are converted to paragraphs and merged into the container
  * - Atomic nodes (tables, media, macros) break out
  *
+ * Special handling for layouts:
+ * - Layout sections break out as separate layouts (preserved as-is, not wrapped)
+ * - Other nodes (including headings, paragraphs, lists) are wrapped into layout columns within a layout section
+ * - Layouts always require layoutColumns as children (never paragraphs directly)
+ * - Layout columns can contain most block content including headings, paragraphs, lists, etc.
+ *
+ * Edge case handling:
+ * - For regular containers: If all content breaks out (container → container transform with no
+ *   valid children), an empty container with a paragraph is created to ensure the target type exists
+ * - For layouts: Edge case handling is skipped because layouts require columns, not direct paragraphs.
+ *   If all content breaks out, only the broken-out nodes are returned (no empty layout created)
+ *
  * What can be wrapped depends on the target container's schema:
  * - expand → panel: tables break out, nestedExpands convert to expands and break out
- * - expand → blockquote: tables/media break out, nestedExpands convert to expands and break out
+ * - expand → blockquote: tables/media break out, nestedExpands convert to expands and break out, headings converted to paragraphs
  * - expand → expand: tables/media stay inside (expands can contain them)
+ * - multi → layoutSection: layout sections break out, headings/paragraphs/lists wrapped into layout columns
  *
  * Example: expand(p('a'), table(), p('b')) → panel: [panel(p('a')), table(), panel(p('b'))]
  * Example: expand(p('a'), panel(p('x')), p('b')) → panel: [panel(p('a')), panel(p('x')), panel(p('b'))]
  * Example: expand(p('a'), nestedExpand({title: 'inner'})(p('x')), p('b')) → panel: [panel(p('a')), expand({title: 'inner'})(p('x')), panel(p('b'))]
  * Example: expand(nestedExpand()(p())) → panel: [panel(), expand()(p())] (empty panel when all content breaks out)
+ * Example: [p('a'), layoutSection(...), p('b')] → layoutSection: [layoutSection(layoutColumn(p('a'))), layoutSection(...), layoutSection(layoutColumn(p('b')))]
+ * Example: [h1('heading'), p('para')] → layoutSection: [layoutSection(layoutColumn(h1('heading'), p('para')))] (headings stay as headings in layouts)
  */
 export declare const wrapMixedContentStep: TransformStep;

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

@@ -2,6 +2,11 @@ import type { NodeRange, Node as PMNode, Schema } from '@atlaskit/editor-prosemi
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { type ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 import type { NodeTypeName } from './types';
+/**
+ * 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.
+ */
+export declare const isTextNode: (node: PMNode) => boolean;
 export declare const getSelectedNode: (selection: Selection) => ContentNodeWithPos | undefined;
 export declare const getTargetNodeTypeNameInContext: (nodeTypeName: NodeTypeName | null, isNested?: boolean, parentNode?: PMNode) => NodeTypeName | null;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "6.0.5",
+	"version": "6.0.7",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,12 +44,12 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^17.0.0",
-		"@atlaskit/tmp-editor-statsig": "^16.3.0",
+		"@atlaskit/tmp-editor-statsig": "^16.4.0",
 		"@atlaskit/tokens": "^9.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.1.0",
+		"@atlaskit/editor-common": "^111.2.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},

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

@@ -1,20 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.wrapIntoLayoutStep = void 0;
-var _marks = require("./marks");
-var wrapIntoLayoutStep = exports.wrapIntoLayoutStep = function wrapIntoLayoutStep(nodes, context) {
-  var schema = context.schema;
-  var _ref = schema.nodes || {},
-    layoutSection = _ref.layoutSection,
-    layoutColumn = _ref.layoutColumn;
-  var columnOne = layoutColumn.createAndFill({}, (0, _marks.removeDisallowedMarks)(nodes, layoutColumn));
-  var columnTwo = layoutColumn.createAndFill();
-  if (!columnOne || !columnTwo) {
-    return nodes;
-  }
-  var layout = layoutSection.createAndFill({}, [columnOne, columnTwo]);
-  return layout ? [layout] : nodes;
-};

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

@@ -1,17 +0,0 @@
-import { removeDisallowedMarks } from './marks';
-export const wrapIntoLayoutStep = (nodes, context) => {
-  const {
-    schema
-  } = context;
-  const {
-    layoutSection,
-    layoutColumn
-  } = schema.nodes || {};
-  const columnOne = layoutColumn.createAndFill({}, removeDisallowedMarks(nodes, layoutColumn));
-  const columnTwo = layoutColumn.createAndFill();
-  if (!columnOne || !columnTwo) {
-    return nodes;
-  }
-  const layout = layoutSection.createAndFill({}, [columnOne, columnTwo]);
-  return layout ? [layout] : nodes;
-};

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

@@ -1,14 +0,0 @@
-import { removeDisallowedMarks } from './marks';
-export var wrapIntoLayoutStep = function wrapIntoLayoutStep(nodes, context) {
-  var schema = context.schema;
-  var _ref = schema.nodes || {},
-    layoutSection = _ref.layoutSection,
-    layoutColumn = _ref.layoutColumn;
-  var columnOne = layoutColumn.createAndFill({}, removeDisallowedMarks(nodes, layoutColumn));
-  var columnTwo = layoutColumn.createAndFill();
-  if (!columnOne || !columnTwo) {
-    return nodes;
-  }
-  var layout = layoutSection.createAndFill({}, [columnOne, columnTwo]);
-  return layout ? [layout] : nodes;
-};

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

@@ -1,2 +0,0 @@
-import type { TransformStep } from './types';
-export declare const wrapIntoLayoutStep: TransformStep;

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

@@ -1,2 +0,0 @@
-import type { TransformStep } from './types';
-export declare const wrapIntoLayoutStep: TransformStep;