@atlaskit/editor-plugin-block-menu 5.2.7 → 5.2.8

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.2.8
+
+### Patch Changes
+
+- [`0006edf16b3a3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0006edf16b3a3) -
+  Editor-2778: Media wrap in container
+
 ## 5.2.7
 
 ### Patch Changes

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

@@ -19,6 +19,7 @@ var _types = require("./types");
 var _unwrapExpandStep = require("./unwrapExpandStep");
 var _unwrapStep = require("./unwrapStep");
 var _wrapIntoLayoutStep = require("./wrapIntoLayoutStep");
+var _wrapIntoListStep = require("./wrapIntoListStep");
 var _wrapStep = require("./wrapStep");
 // Exampled step for overrides:
 // - open Block menu on a paragraph, click 'Panel' in the Turn into'
@@ -33,7 +34,7 @@ var TRANSFORM_STEPS = {
   atomic: {
     atomic: undefined,
     container: [_wrapStep.wrapStep],
-    list: undefined,
+    list: [_wrapIntoListStep.wrapIntoListStep],
     text: undefined
   },
   container: {
@@ -121,7 +122,12 @@ var TRANSFORM_STEPS_OVERRIDE = {
     decisionList: [_flattenListStep.flattenListStep, _listToDecisionListStep.listToDecisionListStep]
   },
   table: {
-    expand: [_wrapStep.wrapStep],
+    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep]
+  },
+  mediaSingle: {
+    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep]
+  },
+  mediaGroup: {
     layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep]
   },
   decisionList: {

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

@@ -76,13 +76,29 @@ var expandSelectionToBlockRange = exports.expandSelectionToBlockRange = function
     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);
+      var $to = selection.$from.doc.resolve(table.pos + table.node.nodeSize);
       return {
         $from: $from,
         $to: $to
       };
     }
   }
+
+  // when selecting a file, selection is on media
+  // need to find media group and return its pos
+  if (selection instanceof _state.NodeSelection) {
+    if (selection.node.type === nodes.media) {
+      var mediaGroup = (0, _utils.findParentNodeOfType)(nodes.mediaGroup)(selection);
+      if (mediaGroup) {
+        var _$from = selection.$from.doc.resolve(mediaGroup.pos);
+        var _$to = selection.$from.doc.resolve(mediaGroup.pos + mediaGroup.node.nodeSize);
+        return {
+          $from: _$from,
+          $to: _$to
+        };
+      }
+    }
+  }
   return (0, _selection.expandToBlockRange)(selection.$from, selection.$to, function (node) {
     if (nodesNeedToExpandRange.includes(node.type)) {
       return false;

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

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.wrapIntoListStep = void 0;
+/** wrap nodes into bullet list or numbered list, does not work for task list */
+var wrapIntoListStep = exports.wrapIntoListStep = function wrapIntoListStep(nodes, context) {
+  var schema = context.schema,
+    targetNodeTypeName = context.targetNodeTypeName;
+  var listItemNode = schema.nodes.listItem.createAndFill({}, nodes);
+  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, listItemNode);
+  if (outputNode) {
+    return [outputNode];
+  }
+  return nodes;
+};

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.transformNode = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _isNestedNode = require("../ui/utils/isNestedNode");
 var _transform = require("./transform-node-utils/transform");
 var _utils = require("./transform-node-utils/utils");
@@ -20,7 +21,9 @@ var transformNode = exports.transformNode = function transformNode(api) {
         if (!preservedSelection) {
           return tr;
         }
-        var _expandSelectionToBlo = (0, _utils.expandSelectionToBlockRange)(preservedSelection, tr.doc.type.schema),
+        var schema = tr.doc.type.schema;
+        var nodes = schema.nodes;
+        var _expandSelectionToBlo = (0, _utils.expandSelectionToBlockRange)(preservedSelection, schema),
           $from = _expandSelectionToBlo.$from,
           $to = _expandSelectionToBlo.$to;
         var isNested = (0, _isNestedNode.isNestedNode)(preservedSelection, '');
@@ -39,9 +42,15 @@ var transformNode = exports.transformNode = function transformNode(api) {
             fragment = fragment.append(_model.Fragment.fromArray(outputNode));
           }
         });
-
-        // TODO: ED-12345 - selection is broken post transaction, to fix.
-        tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, fragment);
+        var nodesToDeleteAndInsert = [nodes.mediaSingle];
+        if (preservedSelection instanceof _state.NodeSelection && nodesToDeleteAndInsert.includes(preservedSelection.node.type)) {
+          // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
+          tr.deleteRange($from.pos, $to.pos);
+          tr.insert($from.pos, fragment);
+        } else {
+          // TODO: ED-12345 - selection is broken post transaction, to fix.
+          tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, fragment);
+        }
         return tr;
       };
     }

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

@@ -13,6 +13,7 @@ import { 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';
 
 // Exampled step for overrides:
@@ -28,7 +29,7 @@ const TRANSFORM_STEPS = {
   atomic: {
     atomic: undefined,
     container: [wrapStep],
-    list: undefined,
+    list: [wrapIntoListStep],
     text: undefined
   },
   container: {
@@ -116,7 +117,12 @@ const TRANSFORM_STEPS_OVERRIDE = {
     decisionList: [flattenListStep, listToDecisionListStep]
   },
   table: {
-    expand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep]
+  },
+  mediaSingle: {
+    layoutSection: [wrapIntoLayoutStep]
+  },
+  mediaGroup: {
     layoutSection: [wrapIntoLayoutStep]
   },
   decisionList: {

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

@@ -73,13 +73,29 @@ export const expandSelectionToBlockRange = (selection, schema) => {
     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);
+      const $to = selection.$from.doc.resolve(table.pos + table.node.nodeSize);
       return {
         $from,
         $to
       };
     }
   }
+
+  // when selecting a file, selection is on media
+  // need to find media group and return its pos
+  if (selection instanceof NodeSelection) {
+    if (selection.node.type === nodes.media) {
+      const mediaGroup = findParentNodeOfType(nodes.mediaGroup)(selection);
+      if (mediaGroup) {
+        const $from = selection.$from.doc.resolve(mediaGroup.pos);
+        const $to = selection.$from.doc.resolve(mediaGroup.pos + mediaGroup.node.nodeSize);
+        return {
+          $from,
+          $to
+        };
+      }
+    }
+  }
   return expandToBlockRange(selection.$from, selection.$to, node => {
     if (nodesNeedToExpandRange.includes(node.type)) {
       return false;

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

@@ -0,0 +1,13 @@
+/** wrap nodes into bullet list or numbered list, does not work for task list */
+export const wrapIntoListStep = (nodes, context) => {
+  const {
+    schema,
+    targetNodeTypeName
+  } = context;
+  const listItemNode = schema.nodes.listItem.createAndFill({}, nodes);
+  const outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, listItemNode);
+  if (outputNode) {
+    return [outputNode];
+  }
+  return nodes;
+};

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

@@ -1,4 +1,5 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { isNestedNode } from '../ui/utils/isNestedNode';
 import { getOutputNodes } from './transform-node-utils/transform';
 import { expandSelectionToBlockRange } from './transform-node-utils/utils';
@@ -14,10 +15,14 @@ export const transformNode = api =>
     if (!preservedSelection) {
       return tr;
     }
+    const schema = tr.doc.type.schema;
+    const {
+      nodes
+    } = schema;
     const {
       $from,
       $to
-    } = expandSelectionToBlockRange(preservedSelection, tr.doc.type.schema);
+    } = expandSelectionToBlockRange(preservedSelection, schema);
     const isNested = isNestedNode(preservedSelection, '');
     const selectedParent = $from.parent;
     let fragment = Fragment.empty;
@@ -34,9 +39,15 @@ export const transformNode = api =>
         fragment = fragment.append(Fragment.fromArray(outputNode));
       }
     });
-
-    // TODO: ED-12345 - selection is broken post transaction, to fix.
-    tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, fragment);
+    const nodesToDeleteAndInsert = [nodes.mediaSingle];
+    if (preservedSelection instanceof NodeSelection && nodesToDeleteAndInsert.includes(preservedSelection.node.type)) {
+      // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
+      tr.deleteRange($from.pos, $to.pos);
+      tr.insert($from.pos, fragment);
+    } else {
+      // TODO: ED-12345 - selection is broken post transaction, to fix.
+      tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, fragment);
+    }
     return tr;
   };
 };

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

@@ -13,6 +13,7 @@ import { 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';
 
 // Exampled step for overrides:
@@ -28,7 +29,7 @@ var TRANSFORM_STEPS = {
   atomic: {
     atomic: undefined,
     container: [wrapStep],
-    list: undefined,
+    list: [wrapIntoListStep],
     text: undefined
   },
   container: {
@@ -116,7 +117,12 @@ var TRANSFORM_STEPS_OVERRIDE = {
     decisionList: [flattenListStep, listToDecisionListStep]
   },
   table: {
-    expand: [wrapStep],
+    layoutSection: [wrapIntoLayoutStep]
+  },
+  mediaSingle: {
+    layoutSection: [wrapIntoLayoutStep]
+  },
+  mediaGroup: {
     layoutSection: [wrapIntoLayoutStep]
   },
   decisionList: {

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

@@ -70,13 +70,29 @@ export var expandSelectionToBlockRange = function expandSelectionToBlockRange(se
     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);
+      var $to = selection.$from.doc.resolve(table.pos + table.node.nodeSize);
       return {
         $from: $from,
         $to: $to
       };
     }
   }
+
+  // when selecting a file, selection is on media
+  // need to find media group and return its pos
+  if (selection instanceof NodeSelection) {
+    if (selection.node.type === nodes.media) {
+      var mediaGroup = findParentNodeOfType(nodes.mediaGroup)(selection);
+      if (mediaGroup) {
+        var _$from = selection.$from.doc.resolve(mediaGroup.pos);
+        var _$to = selection.$from.doc.resolve(mediaGroup.pos + mediaGroup.node.nodeSize);
+        return {
+          $from: _$from,
+          $to: _$to
+        };
+      }
+    }
+  }
   return expandToBlockRange(selection.$from, selection.$to, function (node) {
     if (nodesNeedToExpandRange.includes(node.type)) {
       return false;

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

@@ -0,0 +1,11 @@
+/** wrap nodes into bullet list or numbered list, does not work for task list */
+export var wrapIntoListStep = function wrapIntoListStep(nodes, context) {
+  var schema = context.schema,
+    targetNodeTypeName = context.targetNodeTypeName;
+  var listItemNode = schema.nodes.listItem.createAndFill({}, nodes);
+  var outputNode = schema.nodes[targetNodeTypeName].createAndFill({}, listItemNode);
+  if (outputNode) {
+    return [outputNode];
+  }
+  return nodes;
+};

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

@@ -1,4 +1,5 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { isNestedNode } from '../ui/utils/isNestedNode';
 import { getOutputNodes } from './transform-node-utils/transform';
 import { expandSelectionToBlockRange } from './transform-node-utils/utils';
@@ -14,7 +15,9 @@ export var transformNode = function transformNode(api) {
         if (!preservedSelection) {
           return tr;
         }
-        var _expandSelectionToBlo = expandSelectionToBlockRange(preservedSelection, tr.doc.type.schema),
+        var schema = tr.doc.type.schema;
+        var nodes = schema.nodes;
+        var _expandSelectionToBlo = expandSelectionToBlockRange(preservedSelection, schema),
           $from = _expandSelectionToBlo.$from,
           $to = _expandSelectionToBlo.$to;
         var isNested = isNestedNode(preservedSelection, '');
@@ -33,9 +36,15 @@ export var transformNode = function transformNode(api) {
             fragment = fragment.append(Fragment.fromArray(outputNode));
           }
         });
-
-        // TODO: ED-12345 - selection is broken post transaction, to fix.
-        tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, fragment);
+        var nodesToDeleteAndInsert = [nodes.mediaSingle];
+        if (preservedSelection instanceof NodeSelection && nodesToDeleteAndInsert.includes(preservedSelection.node.type)) {
+          // when node is media single, use tr.replaceWith freeze editor, if modify position, tr.replaceWith creates duplicats
+          tr.deleteRange($from.pos, $to.pos);
+          tr.insert($from.pos, fragment);
+        } else {
+          // TODO: ED-12345 - selection is broken post transaction, to fix.
+          tr.replaceWith(isList ? $from.pos - 1 : $from.pos, $to.pos, fragment);
+        }
         return tr;
       };
     }

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

@@ -0,0 +1,3 @@
+import type { TransformStep } from './types';
+/** wrap nodes into bullet list or numbered list, does not work for task list */
+export declare const wrapIntoListStep: TransformStep;

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

@@ -0,0 +1,3 @@
+import type { TransformStep } from './types';
+/** wrap nodes into bullet list or numbered list, does not work for task list */
+export declare const wrapIntoListStep: TransformStep;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.2.7",
+	"version": "5.2.8",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/css": "^0.17.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-controls": "^7.13.0",
+		"@atlaskit/editor-plugin-block-controls": "^7.14.0",
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
@@ -40,16 +40,16 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.18.0",
 		"@atlaskit/flag": "^17.6.0",
-		"@atlaskit/icon": "^29.0.0",
+		"@atlaskit/icon": "^29.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^16.4.0",
-		"@atlaskit/tmp-editor-statsig": "^15.9.0",
+		"@atlaskit/tmp-editor-statsig": "^15.10.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.41.0",
+		"@atlaskit/editor-common": "^110.42.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},