@atlaskit/editor-plugin-block-menu 5.1.0 → 5.1.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.1.1
+
+### Patch Changes
+
+- [`55bf82f6468ac`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/55bf82f6468ac) -
+  Update transformNode command to work with preservedSelection
+- Updated dependencies
+
 ## 5.1.0
 
 ### Minor Changes

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

@@ -16,10 +16,12 @@ var getSelectedNode = exports.getSelectedNode = function getSelectedNode(selecti
       // ?
       depth: selection.$from.depth
     };
-  } else if (selection instanceof _editorTables.CellSelection) {
+  }
+  if (selection instanceof _editorTables.CellSelection) {
     var tableSelected = (0, _utils.findParentNodeOfType)(selection.$from.doc.type.schema.nodes.table)(selection);
     return tableSelected;
-  } else if (selection instanceof _state.TextSelection) {
+  }
+  if (selection instanceof _state.TextSelection) {
     var _selection$$from$doc$ = selection.$from.doc.type.schema.nodes,
       blockquote = _selection$$from$doc$.blockquote,
       bulletList = _selection$$from$doc$.bulletList,

package/dist/cjs/editor-commands/transformNode.js

@@ -4,30 +4,46 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformNode = void 0;
-var _utils = require("../editor-commands/transform-node-utils/utils");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _transform = require("./transform-node-utils/transform");
-var transformNode = exports.transformNode =
-// eslint-disable-next-line no-unused-vars
-function transformNode(api) {
+var transformNode = exports.transformNode = function transformNode(api) {
   return (
     // eslint-disable-next-line no-unused-vars
     function (targetType, analyticsAttrs) {
       return function (_ref) {
+        var _api$blockControls;
         var tr = _ref.tr;
-        var selection = tr.selection;
-        var source = (0, _utils.getSelectedNode)(selection);
-        if (!source) {
+        var preservedSelection = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.preservedSelection;
+        if (!preservedSelection) {
           return tr;
         }
-        var outputNodes = (0, _transform.getOutputNodes)({
-          sourceNode: source.node,
-          targetNodeType: targetType,
-          schema: selection.$from.doc.type.schema
+        var from = preservedSelection.from,
+          to = preservedSelection.to,
+          $from = preservedSelection.$from;
+        var selectedParent = $from.parent;
+        var fragment = _model.Fragment.empty;
+        // top level selections can safely be transformed without checking for depth
+        var isWithinSelectedRange = $from.depth === 0;
+        tr.doc.nodesBetween(from, to, function (node) {
+          // need to only transform selected content, for nested selections nodesBetween includes the path to the selected parent
+          if (!isWithinSelectedRange && node.eq(selectedParent)) {
+            isWithinSelectedRange = true;
+            return true;
+          }
+          if (isWithinSelectedRange) {
+            var outputNode = (0, _transform.getOutputNodes)({
+              sourceNode: node,
+              targetNodeType: targetType,
+              schema: tr.doc.type.schema
+            });
+            if (outputNode) {
+              fragment = fragment.append(_model.Fragment.fromArray(outputNode));
+            }
+            return false;
+          }
+          return true;
         });
-        if (!outputNodes) {
-          return tr;
-        }
-        tr.replaceWith(source.pos, source.pos + source.node.nodeSize, outputNodes);
+        tr.replaceWith(preservedSelection.from, preservedSelection.to, fragment);
         return tr;
       };
     }

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

@@ -10,10 +10,12 @@ export const getSelectedNode = selection => {
       // ?
       depth: selection.$from.depth
     };
-  } else if (selection instanceof CellSelection) {
+  }
+  if (selection instanceof CellSelection) {
     const tableSelected = findParentNodeOfType(selection.$from.doc.type.schema.nodes.table)(selection);
     return tableSelected;
-  } else if (selection instanceof TextSelection) {
+  }
+  if (selection instanceof TextSelection) {
     const {
       blockquote,
       bulletList,

package/dist/es2019/editor-commands/transformNode.js

@@ -1,29 +1,45 @@
-import { getSelectedNode } from '../editor-commands/transform-node-utils/utils';
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { getOutputNodes } from './transform-node-utils/transform';
-export const transformNode =
-// eslint-disable-next-line no-unused-vars
-api =>
+export const transformNode = api =>
 // eslint-disable-next-line no-unused-vars
 (targetType, analyticsAttrs) => {
   return ({
     tr
   }) => {
-    const {
-      selection
-    } = tr;
-    const source = getSelectedNode(selection);
-    if (!source) {
+    var _api$blockControls, _api$blockControls$sh;
+    const preservedSelection = api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$sh = _api$blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection;
+    if (!preservedSelection) {
       return tr;
     }
-    const outputNodes = getOutputNodes({
-      sourceNode: source.node,
-      targetNodeType: targetType,
-      schema: selection.$from.doc.type.schema
+    const {
+      from,
+      to,
+      $from
+    } = preservedSelection;
+    const selectedParent = $from.parent;
+    let fragment = Fragment.empty;
+    // top level selections can safely be transformed without checking for depth
+    let isWithinSelectedRange = $from.depth === 0;
+    tr.doc.nodesBetween(from, to, node => {
+      // need to only transform selected content, for nested selections nodesBetween includes the path to the selected parent
+      if (!isWithinSelectedRange && node.eq(selectedParent)) {
+        isWithinSelectedRange = true;
+        return true;
+      }
+      if (isWithinSelectedRange) {
+        const outputNode = getOutputNodes({
+          sourceNode: node,
+          targetNodeType: targetType,
+          schema: tr.doc.type.schema
+        });
+        if (outputNode) {
+          fragment = fragment.append(Fragment.fromArray(outputNode));
+        }
+        return false;
+      }
+      return true;
     });
-    if (!outputNodes) {
-      return tr;
-    }
-    tr.replaceWith(source.pos, source.pos + source.node.nodeSize, outputNodes);
+    tr.replaceWith(preservedSelection.from, preservedSelection.to, fragment);
     return tr;
   };
 };

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

@@ -10,10 +10,12 @@ export var getSelectedNode = function getSelectedNode(selection) {
       // ?
       depth: selection.$from.depth
     };
-  } else if (selection instanceof CellSelection) {
+  }
+  if (selection instanceof CellSelection) {
     var tableSelected = findParentNodeOfType(selection.$from.doc.type.schema.nodes.table)(selection);
     return tableSelected;
-  } else if (selection instanceof TextSelection) {
+  }
+  if (selection instanceof TextSelection) {
     var _selection$$from$doc$ = selection.$from.doc.type.schema.nodes,
       blockquote = _selection$$from$doc$.blockquote,
       bulletList = _selection$$from$doc$.bulletList,

package/dist/esm/editor-commands/transformNode.js

@@ -1,27 +1,43 @@
-import { getSelectedNode } from '../editor-commands/transform-node-utils/utils';
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { getOutputNodes } from './transform-node-utils/transform';
-export var transformNode =
-// eslint-disable-next-line no-unused-vars
-function transformNode(api) {
+export var transformNode = function transformNode(api) {
   return (
     // eslint-disable-next-line no-unused-vars
     function (targetType, analyticsAttrs) {
       return function (_ref) {
+        var _api$blockControls;
         var tr = _ref.tr;
-        var selection = tr.selection;
-        var source = getSelectedNode(selection);
-        if (!source) {
+        var preservedSelection = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.preservedSelection;
+        if (!preservedSelection) {
           return tr;
         }
-        var outputNodes = getOutputNodes({
-          sourceNode: source.node,
-          targetNodeType: targetType,
-          schema: selection.$from.doc.type.schema
+        var from = preservedSelection.from,
+          to = preservedSelection.to,
+          $from = preservedSelection.$from;
+        var selectedParent = $from.parent;
+        var fragment = Fragment.empty;
+        // top level selections can safely be transformed without checking for depth
+        var isWithinSelectedRange = $from.depth === 0;
+        tr.doc.nodesBetween(from, to, function (node) {
+          // need to only transform selected content, for nested selections nodesBetween includes the path to the selected parent
+          if (!isWithinSelectedRange && node.eq(selectedParent)) {
+            isWithinSelectedRange = true;
+            return true;
+          }
+          if (isWithinSelectedRange) {
+            var outputNode = getOutputNodes({
+              sourceNode: node,
+              targetNodeType: targetType,
+              schema: tr.doc.type.schema
+            });
+            if (outputNode) {
+              fragment = fragment.append(Fragment.fromArray(outputNode));
+            }
+            return false;
+          }
+          return true;
         });
-        if (!outputNodes) {
-          return tr;
-        }
-        tr.replaceWith(source.pos, source.pos + source.node.nodeSize, outputNodes);
+        tr.replaceWith(preservedSelection.from, preservedSelection.to, fragment);
         return tr;
       };
     }

package/dist/types/editor-commands/transformNode.d.ts

@@ -1,5 +1,5 @@
 import type { EditorCommand, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { NodeType } from '@atlaskit/editor-prosemirror/model';
+import { type NodeType } from '@atlaskit/editor-prosemirror/model';
 import type { BlockMenuPlugin } from '../blockMenuPluginType';
 import type { TransformNodeAnalyticsAttrs } from './transforms/types';
 export declare const transformNode: (api?: ExtractInjectionAPI<BlockMenuPlugin>) => (targetType: NodeType, analyticsAttrs?: TransformNodeAnalyticsAttrs) => EditorCommand;

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

@@ -1,5 +1,5 @@
 import type { EditorCommand, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { NodeType } from '@atlaskit/editor-prosemirror/model';
+import { type NodeType } from '@atlaskit/editor-prosemirror/model';
 import type { BlockMenuPlugin } from '../blockMenuPluginType';
 import type { TransformNodeAnalyticsAttrs } from './transforms/types';
 export declare const transformNode: (api?: ExtractInjectionAPI<BlockMenuPlugin>) => (targetType: NodeType, analyticsAttrs?: TransformNodeAnalyticsAttrs) => EditorCommand;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.1.0",
+	"version": "5.1.1",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^16.4.0",
-		"@atlaskit/tmp-editor-statsig": "^14.2.0",
+		"@atlaskit/tmp-editor-statsig": "^14.3.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@babel/runtime": "^7.0.0"
 	},