@atlaskit/editor-plugin-block-menu 1.0.6 → 1.0.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 1.0.7
+
+### Patch Changes
+
+- [`34871606f04ba`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/34871606f04ba) -
+  [ux] Updates unwrapAndConvertToList to support codeBlock to list case and cases where contnent is
+  not textblock.
+
 ## 1.0.6
 
 ### Patch Changes

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

@@ -171,18 +171,16 @@ var unwrapAndConvertToList = exports.unwrapAndConvertToList = function unwrapAnd
     sourcePos = _ref3.sourcePos,
     targetNodeType = _ref3.targetNodeType,
     targetAttrs = _ref3.targetAttrs;
-  if (sourcePos === null) {
-    return tr;
-  }
   var schema = tr.doc.type.schema;
   var _schema$nodes2 = schema.nodes,
     listItem = _schema$nodes2.listItem,
     paragraph = _schema$nodes2.paragraph,
     taskList = _schema$nodes2.taskList,
-    taskItem = _schema$nodes2.taskItem;
+    taskItem = _schema$nodes2.taskItem,
+    heading = _schema$nodes2.heading;
   var isTargetTaskList = targetNodeType === taskList;
-  var createListItemFromInline = function createListItemFromInline(inlineFrag) {
-    return isTargetTaskList ? taskItem.create(null, inlineFrag) : listItem.create(null, paragraph.create(null, inlineFrag));
+  var createListItemFromInline = function createListItemFromInline(content) {
+    return isTargetTaskList ? taskItem.create(null, content) : listItem.create(null, paragraph.create(null, content));
   };
   var getInlineContent = function getInlineContent(textblock) {
     var inlineContent = [];
@@ -191,30 +189,56 @@ var unwrapAndConvertToList = exports.unwrapAndConvertToList = function unwrapAnd
     });
     return inlineContent;
   };
-  var items = [];
-
+  var resultContent = [];
+  var currentListItems = [];
+  var targetListItemType = isTargetTaskList ? taskItem : listItem;
   // Expand's title should become the first item of the list
   if (sourceNode.type.name === 'expand') {
     var _sourceNode$attrs2;
     var title = (_sourceNode$attrs2 = sourceNode.attrs) === null || _sourceNode$attrs2 === void 0 ? void 0 : _sourceNode$attrs2.title;
     if (title) {
       var titleContent = schema.text(title);
-      items.push(isTargetTaskList ? taskItem.create(null, titleContent) : listItem.create(null, paragraph.create(null, titleContent)));
+      currentListItems.push(createListItemFromInline(titleContent));
     }
   }
-  for (var i = 0; i < sourceNode.childCount; i++) {
-    var node = sourceNode.child(i);
-
-    // Abort early if unsupported content (e.g. table) encounted inside of the container
-    if (!node.isTextblock) {
-      return tr;
+  var createListAndAddToContent = function createListAndAddToContent() {
+    if (currentListItems.length) {
+      var currentList = targetNodeType.create(targetAttrs || null, _model.Fragment.from(currentListItems));
+      currentListItems = [];
+      resultContent.push(currentList);
+    }
+  };
+  if (sourceNode.type.name === 'codeBlock') {
+    var codeText = sourceNode.textContent;
+    if (codeText) {
+      var lines = codeText.split('\n');
+      // Remove empty lines
+      var nonEmptyLines = lines.filter(function (line) {
+        return line.trim().length > 0;
+      });
+      nonEmptyLines.forEach(function (line) {
+        var lineText = schema.text(line);
+        currentListItems.push(createListItemFromInline(lineText));
+      });
     }
-    var inline = _model.Fragment.from(getInlineContent(node));
-    items.push(createListItemFromInline(inline));
+  } else {
+    sourceNode.forEach(function (child) {
+      if (targetListItemType.validContent(_model.Fragment.from(child))) {
+        currentListItems.push(targetListItemType.create(null, child));
+      } else if (heading === child.type || isTargetTaskList && paragraph === child.type) {
+        var inline = _model.Fragment.from(getInlineContent(child));
+        currentListItems.push(createListItemFromInline(inline));
+      } else {
+        // Create list and add list first
+        createListAndAddToContent();
+        // Then add content that can't be converted into listItem
+        resultContent.push(child);
+      }
+    });
   }
-  if (!items.length) {
-    return tr;
+  if (!resultContent.length && !currentListItems.length) {
+    return null;
   }
-  var list = targetNodeType.create(targetAttrs || null, _model.Fragment.from(items));
-  return tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, list);
+  createListAndAddToContent();
+  return tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, _model.Fragment.from(resultContent));
 };

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

@@ -47,6 +47,11 @@ function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType) {
     if ((0, _utils.isLayoutNodeType)(targetNodeType)) {
       return (0, _layoutTransforms.convertToLayout)(transformationContext);
     }
+
+    // special case codeblock to listType
+    if (sourceNode.type.name === 'codeBlock' && (0, _utils.isListNodeType)(targetNodeType)) {
+      return (0, _containerTransforms.unwrapAndConvertToList)(transformationContext);
+    }
     if ((0, _utils.isBlockNode)(sourceNode)) {
       return (0, _blockTransforms.transformBlockNode)(transformationContext);
     }

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

@@ -167,9 +167,6 @@ export const unwrapAndConvertToList = ({
   targetNodeType,
   targetAttrs
 }) => {
-  if (sourcePos === null) {
-    return tr;
-  }
   const {
     schema
   } = tr.doc.type;
@@ -177,11 +174,12 @@ export const unwrapAndConvertToList = ({
     listItem,
     paragraph,
     taskList,
-    taskItem
+    taskItem,
+    heading
   } = schema.nodes;
   const isTargetTaskList = targetNodeType === taskList;
-  const createListItemFromInline = inlineFrag => {
-    return isTargetTaskList ? taskItem.create(null, inlineFrag) : listItem.create(null, paragraph.create(null, inlineFrag));
+  const createListItemFromInline = content => {
+    return isTargetTaskList ? taskItem.create(null, content) : listItem.create(null, paragraph.create(null, content));
   };
   const getInlineContent = textblock => {
     const inlineContent = [];
@@ -190,30 +188,54 @@ export const unwrapAndConvertToList = ({
     });
     return inlineContent;
   };
-  const items = [];
-
+  const resultContent = [];
+  let currentListItems = [];
+  const targetListItemType = isTargetTaskList ? taskItem : listItem;
   // Expand's title should become the first item of the list
   if (sourceNode.type.name === 'expand') {
     var _sourceNode$attrs2;
     const title = (_sourceNode$attrs2 = sourceNode.attrs) === null || _sourceNode$attrs2 === void 0 ? void 0 : _sourceNode$attrs2.title;
     if (title) {
       const titleContent = schema.text(title);
-      items.push(isTargetTaskList ? taskItem.create(null, titleContent) : listItem.create(null, paragraph.create(null, titleContent)));
+      currentListItems.push(createListItemFromInline(titleContent));
     }
   }
-  for (let i = 0; i < sourceNode.childCount; i++) {
-    const node = sourceNode.child(i);
-
-    // Abort early if unsupported content (e.g. table) encounted inside of the container
-    if (!node.isTextblock) {
-      return tr;
+  const createListAndAddToContent = () => {
+    if (currentListItems.length) {
+      const currentList = targetNodeType.create(targetAttrs || null, Fragment.from(currentListItems));
+      currentListItems = [];
+      resultContent.push(currentList);
+    }
+  };
+  if (sourceNode.type.name === 'codeBlock') {
+    const codeText = sourceNode.textContent;
+    if (codeText) {
+      const lines = codeText.split('\n');
+      // Remove empty lines
+      const nonEmptyLines = lines.filter(line => line.trim().length > 0);
+      nonEmptyLines.forEach(line => {
+        const lineText = schema.text(line);
+        currentListItems.push(createListItemFromInline(lineText));
+      });
     }
-    const inline = Fragment.from(getInlineContent(node));
-    items.push(createListItemFromInline(inline));
+  } else {
+    sourceNode.forEach(child => {
+      if (targetListItemType.validContent(Fragment.from(child))) {
+        currentListItems.push(targetListItemType.create(null, child));
+      } else if (heading === child.type || isTargetTaskList && paragraph === child.type) {
+        const inline = Fragment.from(getInlineContent(child));
+        currentListItems.push(createListItemFromInline(inline));
+      } else {
+        // Create list and add list first
+        createListAndAddToContent();
+        // Then add content that can't be converted into listItem
+        resultContent.push(child);
+      }
+    });
   }
-  if (!items.length) {
-    return tr;
+  if (!resultContent.length && !currentListItems.length) {
+    return null;
   }
-  const list = targetNodeType.create(targetAttrs || null, Fragment.from(items));
-  return tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, list);
+  createListAndAddToContent();
+  return tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, Fragment.from(resultContent));
 };

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

@@ -1,8 +1,8 @@
 import { transformBlockNode } from './block-transforms';
-import { transformContainerNode } from './container-transforms';
+import { transformContainerNode, unwrapAndConvertToList } from './container-transforms';
 import { convertToLayout } from './layout-transforms';
 import { transformListNode } from './list-transforms';
-import { getTargetNodeInfo, isBlockNode, isListNode, isContainerNode, isLayoutNodeType } from './utils';
+import { getTargetNodeInfo, isBlockNode, isListNode, isListNodeType, isContainerNode, isLayoutNodeType } from './utils';
 export function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType) {
   const {
     nodes
@@ -45,6 +45,11 @@ export function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType)
     if (isLayoutNodeType(targetNodeType)) {
       return convertToLayout(transformationContext);
     }
+
+    // special case codeblock to listType
+    if (sourceNode.type.name === 'codeBlock' && isListNodeType(targetNodeType)) {
+      return unwrapAndConvertToList(transformationContext);
+    }
     if (isBlockNode(sourceNode)) {
       return transformBlockNode(transformationContext);
     }

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

@@ -164,18 +164,16 @@ export var unwrapAndConvertToList = function unwrapAndConvertToList(_ref3) {
     sourcePos = _ref3.sourcePos,
     targetNodeType = _ref3.targetNodeType,
     targetAttrs = _ref3.targetAttrs;
-  if (sourcePos === null) {
-    return tr;
-  }
   var schema = tr.doc.type.schema;
   var _schema$nodes2 = schema.nodes,
     listItem = _schema$nodes2.listItem,
     paragraph = _schema$nodes2.paragraph,
     taskList = _schema$nodes2.taskList,
-    taskItem = _schema$nodes2.taskItem;
+    taskItem = _schema$nodes2.taskItem,
+    heading = _schema$nodes2.heading;
   var isTargetTaskList = targetNodeType === taskList;
-  var createListItemFromInline = function createListItemFromInline(inlineFrag) {
-    return isTargetTaskList ? taskItem.create(null, inlineFrag) : listItem.create(null, paragraph.create(null, inlineFrag));
+  var createListItemFromInline = function createListItemFromInline(content) {
+    return isTargetTaskList ? taskItem.create(null, content) : listItem.create(null, paragraph.create(null, content));
   };
   var getInlineContent = function getInlineContent(textblock) {
     var inlineContent = [];
@@ -184,30 +182,56 @@ export var unwrapAndConvertToList = function unwrapAndConvertToList(_ref3) {
     });
     return inlineContent;
   };
-  var items = [];
-
+  var resultContent = [];
+  var currentListItems = [];
+  var targetListItemType = isTargetTaskList ? taskItem : listItem;
   // Expand's title should become the first item of the list
   if (sourceNode.type.name === 'expand') {
     var _sourceNode$attrs2;
     var title = (_sourceNode$attrs2 = sourceNode.attrs) === null || _sourceNode$attrs2 === void 0 ? void 0 : _sourceNode$attrs2.title;
     if (title) {
       var titleContent = schema.text(title);
-      items.push(isTargetTaskList ? taskItem.create(null, titleContent) : listItem.create(null, paragraph.create(null, titleContent)));
+      currentListItems.push(createListItemFromInline(titleContent));
     }
   }
-  for (var i = 0; i < sourceNode.childCount; i++) {
-    var node = sourceNode.child(i);
-
-    // Abort early if unsupported content (e.g. table) encounted inside of the container
-    if (!node.isTextblock) {
-      return tr;
+  var createListAndAddToContent = function createListAndAddToContent() {
+    if (currentListItems.length) {
+      var currentList = targetNodeType.create(targetAttrs || null, Fragment.from(currentListItems));
+      currentListItems = [];
+      resultContent.push(currentList);
+    }
+  };
+  if (sourceNode.type.name === 'codeBlock') {
+    var codeText = sourceNode.textContent;
+    if (codeText) {
+      var lines = codeText.split('\n');
+      // Remove empty lines
+      var nonEmptyLines = lines.filter(function (line) {
+        return line.trim().length > 0;
+      });
+      nonEmptyLines.forEach(function (line) {
+        var lineText = schema.text(line);
+        currentListItems.push(createListItemFromInline(lineText));
+      });
     }
-    var inline = Fragment.from(getInlineContent(node));
-    items.push(createListItemFromInline(inline));
+  } else {
+    sourceNode.forEach(function (child) {
+      if (targetListItemType.validContent(Fragment.from(child))) {
+        currentListItems.push(targetListItemType.create(null, child));
+      } else if (heading === child.type || isTargetTaskList && paragraph === child.type) {
+        var inline = Fragment.from(getInlineContent(child));
+        currentListItems.push(createListItemFromInline(inline));
+      } else {
+        // Create list and add list first
+        createListAndAddToContent();
+        // Then add content that can't be converted into listItem
+        resultContent.push(child);
+      }
+    });
   }
-  if (!items.length) {
-    return tr;
+  if (!resultContent.length && !currentListItems.length) {
+    return null;
   }
-  var list = targetNodeType.create(targetAttrs || null, Fragment.from(items));
-  return tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, list);
+  createListAndAddToContent();
+  return tr.replaceWith(sourcePos, sourcePos + sourceNode.nodeSize, Fragment.from(resultContent));
 };

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

@@ -1,8 +1,8 @@
 import { transformBlockNode } from './block-transforms';
-import { transformContainerNode } from './container-transforms';
+import { transformContainerNode, unwrapAndConvertToList } from './container-transforms';
 import { convertToLayout } from './layout-transforms';
 import { transformListNode } from './list-transforms';
-import { getTargetNodeInfo, isBlockNode, isListNode, isContainerNode, isLayoutNodeType } from './utils';
+import { getTargetNodeInfo, isBlockNode, isListNode, isListNodeType, isContainerNode, isLayoutNodeType } from './utils';
 export function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType) {
   var nodes = tr.doc.type.schema.nodes;
   var targetNodeInfo = getTargetNodeInfo(targetType, nodes);
@@ -41,6 +41,11 @@ export function transformNodeToTargetType(tr, sourceNode, sourcePos, targetType)
     if (isLayoutNodeType(targetNodeType)) {
       return convertToLayout(transformationContext);
     }
+
+    // special case codeblock to listType
+    if (sourceNode.type.name === 'codeBlock' && isListNodeType(targetNodeType)) {
+      return unwrapAndConvertToList(transformationContext);
+    }
     if (isBlockNode(sourceNode)) {
       return transformBlockNode(transformationContext);
     }

package/dist/types/editor-commands/transforms/container-transforms.d.ts

@@ -14,4 +14,4 @@ export declare const unwrapAndConvertToBlockType: (context: TransformContext) =>
 /**
  * Unwrap container node and convert content to list
  */
-export declare const unwrapAndConvertToList: ({ tr, sourceNode, sourcePos, targetNodeType, targetAttrs, }: TransformContext) => import("prosemirror-state").Transaction;
+export declare const unwrapAndConvertToList: ({ tr, sourceNode, sourcePos, targetNodeType, targetAttrs, }: TransformContext) => import("prosemirror-state").Transaction | null;

package/dist/types-ts4.5/editor-commands/transforms/container-transforms.d.ts

@@ -14,4 +14,4 @@ export declare const unwrapAndConvertToBlockType: (context: TransformContext) =>
 /**
  * Unwrap container node and convert content to list
  */
-export declare const unwrapAndConvertToList: ({ tr, sourceNode, sourcePos, targetNodeType, targetAttrs, }: TransformContext) => import("prosemirror-state").Transaction;
+export declare const unwrapAndConvertToList: ({ tr, sourceNode, sourcePos, targetNodeType, targetAttrs, }: TransformContext) => import("prosemirror-state").Transaction | null;

package/package.json

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