@atlaskit/editor-plugin-block-menu 5.2.0 → 5.2.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.2.1
+
+### Patch Changes
+
+- [`e1a0f13fc5c83`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e1a0f13fc5c83) -
+  Editor-2778: Table transform to expand and layout
+- Updated dependencies
+
 ## 5.2.0
 
 ### Minor Changes

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

@@ -31,7 +31,7 @@ var wrapIntoPanelStep = function wrapIntoPanelStep(nodes, context) {
 var TRANSFORM_STEPS = {
   atomic: {
     atomic: undefined,
-    container: [_stubStep.stubStep],
+    container: [_wrapStep.wrapStep],
     list: undefined,
     text: undefined
   },
@@ -115,6 +115,10 @@ var TRANSFORM_STEPS_OVERRIDE = {
     // Warning: Actuall transformation logic not complete (Likelly prosemirror-markdown to be used)
     codeBlock: [_convertTaskListToTextStep.convertTaskListToTextStep, _flattenStep.flattenStep, _wrapStep.wrapStep],
     layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep]
+  },
+  table: {
+    expand: [_wrapStep.wrapStep],
+    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep]
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {

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

@@ -8,6 +8,7 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorTables = require("@atlaskit/editor-tables");
+var _utils2 = require("@atlaskit/editor-tables/utils");
 var getSelectedNode = exports.getSelectedNode = function getSelectedNode(selection) {
   if (selection instanceof _state.NodeSelection) {
     return {
@@ -58,29 +59,34 @@ var getTargetNodeTypeNameInContext = exports.getTargetNodeTypeNameInContext = fu
 };
 
 /**
- * Use common expandToBlockRange function, but account for edge cases with lists.
- *
+ * Use common expandToBlockRange function to get the correct range for the selection
+ * For example, if selection starts in a listItem, go find the bullet list or ordered list, their $from
  * @param selection
  * @param schema
  * @returns
  */
 var expandSelectionToBlockRange = exports.expandSelectionToBlockRange = function expandSelectionToBlockRange(selection, schema) {
-  var isListInSelection = (0, _utils.hasParentNode)(function (node) {
-    return node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList;
-  })(selection);
-  var _expandToBlockRange = (0, _selection.expandToBlockRange)(selection.$from, selection.$to, function (node) {
-      if (!isListInSelection) {
-        return true;
-      }
-      if (node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList) {
-        return true;
-      }
+  var nodes = schema.nodes;
+  var nodesNeedToExpandRange = [nodes.listItem, nodes.taskItem];
+
+  // when adding nodes.tableRow, tableHeader, tableCell in nodesNeedToExpandRang,
+  // expandToBlockRange does not return expected table start position, sometimes even freeze editor
+  // so handle table in the below logic
+  if ((0, _utils2.isTableSelected)(selection)) {
+    var table = (0, _utils2.findTable)(selection);
+    if (table) {
+      var $from = selection.$from.doc.resolve(table.pos);
+      var $to = selection.$from.doc.resolve(table.pos + table.node.nodeSize - 1);
+      return {
+        $from: $from,
+        $to: $to
+      };
+    }
+  }
+  return (0, _selection.expandToBlockRange)(selection.$from, selection.$to, function (node) {
+    if (nodesNeedToExpandRange.includes(node.type)) {
       return false;
-    }),
-    $from = _expandToBlockRange.$from,
-    $to = _expandToBlockRange.$to;
-  return {
-    $from: $from,
-    $to: $to
-  };
+    }
+    return true;
+  });
 };

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

@@ -26,7 +26,7 @@ const wrapIntoPanelStep = (nodes, context) => {
 const TRANSFORM_STEPS = {
   atomic: {
     atomic: undefined,
-    container: [stubStep],
+    container: [wrapStep],
     list: undefined,
     text: undefined
   },
@@ -110,6 +110,10 @@ const TRANSFORM_STEPS_OVERRIDE = {
     // Warning: Actuall transformation logic not complete (Likelly prosemirror-markdown to be used)
     codeBlock: [convertTaskListToTextStep, flattenStep, wrapStep],
     layoutSection: [wrapIntoLayoutStep]
+  },
+  table: {
+    expand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep]
   }
 };
 const getTransformStepsForNodeTypes = (selectedNodeTypeName, targetNodeTypeName) => {

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

@@ -1,7 +1,8 @@
 import { expandToBlockRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfType, hasParentNode } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables';
+import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 export const getSelectedNode = selection => {
   if (selection instanceof NodeSelection) {
     return {
@@ -53,28 +54,36 @@ export const getTargetNodeTypeNameInContext = (nodeTypeName, isNested) => {
 };
 
 /**
- * Use common expandToBlockRange function, but account for edge cases with lists.
- *
+ * Use common expandToBlockRange function to get the correct range for the selection
+ * For example, if selection starts in a listItem, go find the bullet list or ordered list, their $from
  * @param selection
  * @param schema
  * @returns
  */
 export const expandSelectionToBlockRange = (selection, schema) => {
-  const isListInSelection = hasParentNode(node => node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList)(selection);
   const {
-    $from,
-    $to
-  } = expandToBlockRange(selection.$from, selection.$to, node => {
-    if (!isListInSelection) {
-      return true;
+    nodes
+  } = schema;
+  const nodesNeedToExpandRange = [nodes.listItem, nodes.taskItem];
+
+  // when adding nodes.tableRow, tableHeader, tableCell in nodesNeedToExpandRang,
+  // expandToBlockRange does not return expected table start position, sometimes even freeze editor
+  // so handle table in the below logic
+  if (isTableSelected(selection)) {
+    const table = findTable(selection);
+    if (table) {
+      const $from = selection.$from.doc.resolve(table.pos);
+      const $to = selection.$from.doc.resolve(table.pos + table.node.nodeSize - 1);
+      return {
+        $from,
+        $to
+      };
     }
-    if (node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList) {
-      return true;
+  }
+  return expandToBlockRange(selection.$from, selection.$to, node => {
+    if (nodesNeedToExpandRange.includes(node.type)) {
+      return false;
     }
-    return false;
+    return true;
   });
-  return {
-    $from,
-    $to
-  };
 };

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

@@ -26,7 +26,7 @@ var wrapIntoPanelStep = function wrapIntoPanelStep(nodes, context) {
 var TRANSFORM_STEPS = {
   atomic: {
     atomic: undefined,
-    container: [stubStep],
+    container: [wrapStep],
     list: undefined,
     text: undefined
   },
@@ -110,6 +110,10 @@ var TRANSFORM_STEPS_OVERRIDE = {
     // Warning: Actuall transformation logic not complete (Likelly prosemirror-markdown to be used)
     codeBlock: [convertTaskListToTextStep, flattenStep, wrapStep],
     layoutSection: [wrapIntoLayoutStep]
+  },
+  table: {
+    expand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep]
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {

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

@@ -1,7 +1,8 @@
 import { expandToBlockRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfType, hasParentNode } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables';
+import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 export var getSelectedNode = function getSelectedNode(selection) {
   if (selection instanceof NodeSelection) {
     return {
@@ -52,29 +53,34 @@ export var getTargetNodeTypeNameInContext = function getTargetNodeTypeNameInCont
 };
 
 /**
- * Use common expandToBlockRange function, but account for edge cases with lists.
- *
+ * Use common expandToBlockRange function to get the correct range for the selection
+ * For example, if selection starts in a listItem, go find the bullet list or ordered list, their $from
  * @param selection
  * @param schema
  * @returns
  */
 export var expandSelectionToBlockRange = function expandSelectionToBlockRange(selection, schema) {
-  var isListInSelection = hasParentNode(function (node) {
-    return node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList;
-  })(selection);
-  var _expandToBlockRange = expandToBlockRange(selection.$from, selection.$to, function (node) {
-      if (!isListInSelection) {
-        return true;
-      }
-      if (node.type === schema.nodes.bulletList || node.type === schema.nodes.orderedList) {
-        return true;
-      }
+  var nodes = schema.nodes;
+  var nodesNeedToExpandRange = [nodes.listItem, nodes.taskItem];
+
+  // when adding nodes.tableRow, tableHeader, tableCell in nodesNeedToExpandRang,
+  // expandToBlockRange does not return expected table start position, sometimes even freeze editor
+  // so handle table in the below logic
+  if (isTableSelected(selection)) {
+    var table = findTable(selection);
+    if (table) {
+      var $from = selection.$from.doc.resolve(table.pos);
+      var $to = selection.$from.doc.resolve(table.pos + table.node.nodeSize - 1);
+      return {
+        $from: $from,
+        $to: $to
+      };
+    }
+  }
+  return expandToBlockRange(selection.$from, selection.$to, function (node) {
+    if (nodesNeedToExpandRange.includes(node.type)) {
       return false;
-    }),
-    $from = _expandToBlockRange.$from,
-    $to = _expandToBlockRange.$to;
-  return {
-    $from: $from,
-    $to: $to
-  };
+    }
+    return true;
+  });
 };

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

@@ -5,8 +5,8 @@ import type { NodeTypeName } from './types';
 export declare const getSelectedNode: (selection: Selection) => ContentNodeWithPos | undefined;
 export declare const getTargetNodeTypeNameInContext: (nodeTypeName: NodeTypeName | null, isNested?: boolean) => NodeTypeName | null;
 /**
- * Use common expandToBlockRange function, but account for edge cases with lists.
- *
+ * Use common expandToBlockRange function to get the correct range for the selection
+ * For example, if selection starts in a listItem, go find the bullet list or ordered list, their $from
  * @param selection
  * @param schema
  * @returns

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

@@ -5,8 +5,8 @@ import type { NodeTypeName } from './types';
 export declare const getSelectedNode: (selection: Selection) => ContentNodeWithPos | undefined;
 export declare const getTargetNodeTypeNameInContext: (nodeTypeName: NodeTypeName | null, isNested?: boolean) => NodeTypeName | null;
 /**
- * Use common expandToBlockRange function, but account for edge cases with lists.
- *
+ * Use common expandToBlockRange function to get the correct range for the selection
+ * For example, if selection starts in a listItem, go find the bullet list or ordered list, their $from
  * @param selection
  * @param schema
  * @returns

package/package.json

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