@atlaskit/editor-plugin-block-controls 2.13.18 → 2.13.20

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.13.20
+
+### Patch Changes
+
+- [#167178](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/167178)
+  [`c2bcf67d564c7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c2bcf67d564c7) -
+  Apply breakout mark to layout node when dnd target or source node contains it
+
+## 2.13.19
+
+### Patch Changes
+
+- [#166785](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/166785)
+  [`d892942b6debe`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d892942b6debe) -
+  [ux] ED-25750: Updated layout column tooltip texts
+- Updated dependencies
+
 ## 2.13.18
 
 ### Patch Changes

package/dist/cjs/commands/move-to-layout.js

@@ -116,6 +116,15 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
       var _ref7 = tr.doc.type.schema.marks || {},
         breakout = _ref7.breakout;
       var fromNodeWithoutBreakout = fromNode;
+      var getBreakoutMode = function getBreakoutMode(node) {
+        var _node$marks$find;
+        return (_node$marks$find = node.marks.find(function (m) {
+          return m.type === breakout;
+        })) === null || _node$marks$find === void 0 ? void 0 : _node$marks$find.attrs.mode;
+      };
+      // get breakout mode from destination node,
+      // if not found, get from source node,
+      var breakoutMode = getBreakoutMode(toNode) || getBreakoutMode(fromNode);
 
       // remove breakout from node;
       if (breakout && $from.nodeAfter && $from.nodeAfter.marks.some(function (m) {
@@ -156,6 +165,9 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
           tr = (0, _removeFromSource.removeFromSource)(tr, $from);
           var mappedTo = tr.mapping.map(to);
           tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout).setSelection(new _state.NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+          breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
+            mode: breakoutMode
+          })]);
         }
         return tr;
       }

package/dist/cjs/ui/drag-handle.js

@@ -394,6 +394,13 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       }]);
     }
   }
+
+  // When advanced layout is on, layout column drag handle show only show 'Drag to move', no shortcuts
+  if ((0, _experiments.editorExperiment)('advanced_layouts', true) && nodeType === 'layoutColumn') {
+    helpDescriptors = [{
+      description: formatMessage(_messages.blockControlsMessages.dragToMove)
+    }];
+  }
   var message = helpDescriptors.map(function (descriptor) {
     return descriptor.keymap ? [descriptor.description, (0, _keymaps.getAriaKeyshortcuts)(descriptor.keymap)] : [descriptor.description];
   }).join('. ');

package/dist/es2019/commands/move-to-layout.js

@@ -117,6 +117,13 @@ export const moveToLayout = api => (from, to, options) => ({
     breakout
   } = tr.doc.type.schema.marks || {};
   let fromNodeWithoutBreakout = fromNode;
+  const getBreakoutMode = node => {
+    var _node$marks$find;
+    return (_node$marks$find = node.marks.find(m => m.type === breakout)) === null || _node$marks$find === void 0 ? void 0 : _node$marks$find.attrs.mode;
+  };
+  // get breakout mode from destination node,
+  // if not found, get from source node,
+  const breakoutMode = getBreakoutMode(toNode) || getBreakoutMode(fromNode);
 
   // remove breakout from node;
   if (breakout && $from.nodeAfter && $from.nodeAfter.marks.some(m => m.type === breakout)) {
@@ -153,6 +160,9 @@ export const moveToLayout = api => (from, to, options) => ({
       tr = removeFromSource(tr, $from);
       const mappedTo = tr.mapping.map(to);
       tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout).setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+      breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
+        mode: breakoutMode
+      })]);
     }
     return tr;
   }

package/dist/es2019/ui/drag-handle.js

@@ -375,6 +375,13 @@ export const DragHandle = ({
       }];
     }
   }
+
+  // When advanced layout is on, layout column drag handle show only show 'Drag to move', no shortcuts
+  if (editorExperiment('advanced_layouts', true) && nodeType === 'layoutColumn') {
+    helpDescriptors = [{
+      description: formatMessage(blockControlsMessages.dragToMove)
+    }];
+  }
   const message = helpDescriptors.map(descriptor => {
     return descriptor.keymap ? [descriptor.description, getAriaKeyshortcuts(descriptor.keymap)] : [descriptor.description];
   }).join('. ');

package/dist/esm/commands/move-to-layout.js

@@ -110,6 +110,15 @@ export var moveToLayout = function moveToLayout(api) {
       var _ref7 = tr.doc.type.schema.marks || {},
         breakout = _ref7.breakout;
       var fromNodeWithoutBreakout = fromNode;
+      var getBreakoutMode = function getBreakoutMode(node) {
+        var _node$marks$find;
+        return (_node$marks$find = node.marks.find(function (m) {
+          return m.type === breakout;
+        })) === null || _node$marks$find === void 0 ? void 0 : _node$marks$find.attrs.mode;
+      };
+      // get breakout mode from destination node,
+      // if not found, get from source node,
+      var breakoutMode = getBreakoutMode(toNode) || getBreakoutMode(fromNode);
 
       // remove breakout from node;
       if (breakout && $from.nodeAfter && $from.nodeAfter.marks.some(function (m) {
@@ -150,6 +159,9 @@ export var moveToLayout = function moveToLayout(api) {
           tr = removeFromSource(tr, $from);
           var mappedTo = tr.mapping.map(to);
           tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout).setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+          breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
+            mode: breakoutMode
+          })]);
         }
         return tr;
       }

package/dist/esm/ui/drag-handle.js

@@ -385,6 +385,13 @@ export var DragHandle = function DragHandle(_ref) {
       }]);
     }
   }
+
+  // When advanced layout is on, layout column drag handle show only show 'Drag to move', no shortcuts
+  if (editorExperiment('advanced_layouts', true) && nodeType === 'layoutColumn') {
+    helpDescriptors = [{
+      description: formatMessage(blockControlsMessages.dragToMove)
+    }];
+  }
   var message = helpDescriptors.map(function (descriptor) {
     return descriptor.keymap ? [descriptor.description, getAriaKeyshortcuts(descriptor.keymap)] : [descriptor.description];
   }).join('. ');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.13.18",
+	"version": "2.13.20",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^44.2.0",
-		"@atlaskit/editor-common": "^94.24.0",
+		"@atlaskit/editor-common": "^95.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -41,7 +41,7 @@
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^22.24.0",
+		"@atlaskit/icon": "^22.25.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.4.0",
@@ -49,7 +49,7 @@
 		"@atlaskit/primitives": "^13.2.0",
 		"@atlaskit/theme": "^14.0.0",
 		"@atlaskit/tmp-editor-statsig": "^2.19.0",
-		"@atlaskit/tokens": "^2.2.0",
+		"@atlaskit/tokens": "^2.3.0",
 		"@atlaskit/tooltip": "^18.9.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",