@atlaskit/editor-plugin-block-controls 2.3.0 → 2.4.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.4.0
+
+### Minor Changes
+
+- [#151190](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/151190)
+  [`a3723b1cdede2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a3723b1cdede2) -
+  [ux] [ED-25037] this change bumps @atlaskit/adf-schema from 40.9.0 to 40.9.4 which makes the
+  blockquote selectable, adds missing marks to the PM node spec and fixes a bug that converted
+  pasted external images to media groups.
+
+### Patch Changes
+
+- [#151190](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/151190)
+  [`a3723b1cdede2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a3723b1cdede2) -
+  [ux] [ED-25037] This change selects the blockquote node when the blockquote contains media, but
+  otherwise it will select all the inline content inside the blockquote (previous functionality)
+  when using the drag handle to select.
+- [`28f31fcff6ff2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/28f31fcff6ff2) -
+  Fix classList check
+- Updated dependencies
+
+## 2.3.1
+
+### Patch Changes
+
+- [#149764](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/149764)
+  [`f6226757e21b9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f6226757e21b9) -
+  Change move left/right shortcut for nested nodes
+
 ## 2.3.0
 
 ### Minor Changes

package/dist/cjs/commands/move-node.js

@@ -105,7 +105,9 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
         moveToPos = $pos.after($pos.depth) + 1;
       } else if (direction === _consts.DIRECTION.UP) {
         var nodeBefore = $pos.depth > 1 && nodeIndex === 0 && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_a11y') ? $pos.node($pos.depth) : $pos.nodeBefore;
-        moveToPos = $pos.depth > 1 && nodeIndex === 0 && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_a11y') ? $pos.before($pos.depth) - 1 : nodeBefore ? currentNodePos - nodeBefore.nodeSize : moveToPos;
+        if (nodeBefore) {
+          moveToPos = currentNodePos - nodeBefore.nodeSize;
+        }
       } else {
         var endOfDoc = $pos.end();
         var nodeAfterPos = $pos.posAtIndex($pos.index() + 1);

package/dist/cjs/pm-plugins/handle-mouse-over.js

@@ -19,7 +19,7 @@ var isDocFirstChildEmptyLine = function isDocFirstChildEmptyLine(elem) {
   return (parentElement === null || parentElement === void 0 ? void 0 : parentElement.classList.contains('ProseMirror')) && (parentElement === null || parentElement === void 0 ? void 0 : parentElement.firstElementChild) === elem && ['P', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6'].includes(elem.nodeName) && elem.childNodes.length === 1 && ((_elem$firstElementChi = elem.firstElementChild) === null || _elem$firstElementChi === void 0 ? void 0 : _elem$firstElementChi.classList.contains('ProseMirror-trailingBreak'));
 };
 var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, event, api) {
-  var _api$blockControls;
+  var _api$blockControls, _target$classList;
   var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
     isDragging = _ref.isDragging,
     activeNode = _ref.activeNode;
@@ -30,7 +30,7 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     return false;
   }
   var target = event.target;
-  if (target.classList.contains('ProseMirror')) {
+  if (target !== null && target !== void 0 && (_target$classList = target.classList) !== null && _target$classList !== void 0 && _target$classList.contains('ProseMirror')) {
     return false;
   }
   var rootElement = target === null || target === void 0 ? void 0 : target.closest('[data-drag-handler-anchor-name]');

package/dist/cjs/utils/getNestedNodePosition.js

@@ -15,10 +15,10 @@ var getNestedNodePosition = exports.getNestedNodePosition = function getNestedNo
     if ($pos.depth < 1) {
       return nestedNodePos;
     }
-    var parentNodeOfSpecificTypes = (0, _utils.findParentNodeOfType)([state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.blockquote, state.schema.nodes.taskList])(state.selection);
+    var parentNodeOfSpecificTypes = (0, _utils.findParentNodeOfType)([state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.blockquote, state.schema.nodes.taskList, state.schema.nodes.decisionList])(state.selection);
     if (parentNodeOfSpecificTypes) {
       var parentNodeType = parentNodeOfSpecificTypes.node.type.name;
-      nestedNodePos = ['bulletList', 'orderedList'].includes(parentNodeType) ? $pos.before($pos.depth - 1) : ['blockquote', 'taskList'].includes(parentNodeType) ? $pos.before() : nestedNodePos;
+      nestedNodePos = ['bulletList', 'orderedList'].includes(parentNodeType) ? $pos.before($pos.depth - 1) : ['blockquote', 'taskList', 'decisionList'].includes(parentNodeType) ? $pos.before() : nestedNodePos;
     }
   } else {
     nestedNodePos = selection.$from.pos;

package/dist/cjs/utils/getSelection.js

@@ -29,15 +29,26 @@ var getInlineNodePos = exports.getInlineNodePos = function getInlineNodePos(tr,
     inlineNodeEndPos: inlineNodeEndPos
   };
 };
+var isNodeWithMedia = function isNodeWithMedia(tr, start, nodeSize) {
+  var $startPos = tr.doc.resolve(start);
+  var hasMedia = false;
+  tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n) {
+    if (n.type.name === 'media') {
+      hasMedia = true;
+    }
+  });
+  return hasMedia;
+};
 var getSelection = exports.getSelection = function getSelection(tr, start) {
   var node = tr.doc.nodeAt(start);
   var isNodeSelection = node && _state.NodeSelection.isSelectable(node);
   var nodeSize = node ? node.nodeSize : 1;
   var $startPos = tr.doc.resolve(start);
   var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
+  var isBlockQuoteWithMedia = nodeName === 'blockquote' && isNodeWithMedia(tr, start, nodeSize);
 
   // decisionList node is not selectable, but we want to select the whole node not just text
-  if (isNodeSelection || nodeName === 'decisionList') {
+  if (isNodeSelection && nodeName !== 'blockquote' || isBlockQuoteWithMedia || nodeName === 'decisionList') {
     return new _state.NodeSelection($startPos);
   } else if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
     var $mediaStartPos = tr.doc.resolve(start + 1);

package/dist/es2019/commands/move-node.js

@@ -100,7 +100,9 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
         moveToPos = $pos.after($pos.depth) + 1;
       } else if (direction === DIRECTION.UP) {
         const nodeBefore = $pos.depth > 1 && nodeIndex === 0 && fg('platform_editor_element_dnd_nested_a11y') ? $pos.node($pos.depth) : $pos.nodeBefore;
-        moveToPos = $pos.depth > 1 && nodeIndex === 0 && fg('platform_editor_element_dnd_nested_a11y') ? $pos.before($pos.depth) - 1 : nodeBefore ? currentNodePos - nodeBefore.nodeSize : moveToPos;
+        if (nodeBefore) {
+          moveToPos = currentNodePos - nodeBefore.nodeSize;
+        }
       } else {
         const endOfDoc = $pos.end();
         const nodeAfterPos = $pos.posAtIndex($pos.index() + 1);

package/dist/es2019/pm-plugins/handle-mouse-over.js

@@ -13,7 +13,7 @@ const isDocFirstChildEmptyLine = elem => {
   return (parentElement === null || parentElement === void 0 ? void 0 : parentElement.classList.contains('ProseMirror')) && (parentElement === null || parentElement === void 0 ? void 0 : parentElement.firstElementChild) === elem && ['P', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6'].includes(elem.nodeName) && elem.childNodes.length === 1 && ((_elem$firstElementChi = elem.firstElementChild) === null || _elem$firstElementChi === void 0 ? void 0 : _elem$firstElementChi.classList.contains('ProseMirror-trailingBreak'));
 };
 export const handleMouseOver = (view, event, api) => {
-  var _api$blockControls;
+  var _api$blockControls, _target$classList;
   const {
     isDragging,
     activeNode
@@ -25,7 +25,7 @@ export const handleMouseOver = (view, event, api) => {
     return false;
   }
   const target = event.target;
-  if (target.classList.contains('ProseMirror')) {
+  if (target !== null && target !== void 0 && (_target$classList = target.classList) !== null && _target$classList !== void 0 && _target$classList.contains('ProseMirror')) {
     return false;
   }
   let rootElement = target === null || target === void 0 ? void 0 : target.closest('[data-drag-handler-anchor-name]');

package/dist/es2019/utils/getNestedNodePosition.js

@@ -11,10 +11,10 @@ export const getNestedNodePosition = state => {
     if ($pos.depth < 1) {
       return nestedNodePos;
     }
-    const parentNodeOfSpecificTypes = findParentNodeOfType([state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.blockquote, state.schema.nodes.taskList])(state.selection);
+    const parentNodeOfSpecificTypes = findParentNodeOfType([state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.blockquote, state.schema.nodes.taskList, state.schema.nodes.decisionList])(state.selection);
     if (parentNodeOfSpecificTypes) {
       const parentNodeType = parentNodeOfSpecificTypes.node.type.name;
-      nestedNodePos = ['bulletList', 'orderedList'].includes(parentNodeType) ? $pos.before($pos.depth - 1) : ['blockquote', 'taskList'].includes(parentNodeType) ? $pos.before() : nestedNodePos;
+      nestedNodePos = ['bulletList', 'orderedList'].includes(parentNodeType) ? $pos.before($pos.depth - 1) : ['blockquote', 'taskList', 'decisionList'].includes(parentNodeType) ? $pos.before() : nestedNodePos;
     }
   } else {
     nestedNodePos = selection.$from.pos;

package/dist/es2019/utils/getSelection.js

@@ -23,15 +23,26 @@ export const getInlineNodePos = (tr, start, nodeSize) => {
     inlineNodeEndPos
   };
 };
+const isNodeWithMedia = (tr, start, nodeSize) => {
+  const $startPos = tr.doc.resolve(start);
+  let hasMedia = false;
+  tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, n => {
+    if (n.type.name === 'media') {
+      hasMedia = true;
+    }
+  });
+  return hasMedia;
+};
 export const getSelection = (tr, start) => {
   const node = tr.doc.nodeAt(start);
   const isNodeSelection = node && NodeSelection.isSelectable(node);
   const nodeSize = node ? node.nodeSize : 1;
   const $startPos = tr.doc.resolve(start);
   const nodeName = node === null || node === void 0 ? void 0 : node.type.name;
+  const isBlockQuoteWithMedia = nodeName === 'blockquote' && isNodeWithMedia(tr, start, nodeSize);
 
   // decisionList node is not selectable, but we want to select the whole node not just text
-  if (isNodeSelection || nodeName === 'decisionList') {
+  if (isNodeSelection && nodeName !== 'blockquote' || isBlockQuoteWithMedia || nodeName === 'decisionList') {
     return new NodeSelection($startPos);
   } else if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
     const $mediaStartPos = tr.doc.resolve(start + 1);

package/dist/esm/commands/move-node.js

@@ -99,7 +99,9 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
         moveToPos = $pos.after($pos.depth) + 1;
       } else if (direction === DIRECTION.UP) {
         var nodeBefore = $pos.depth > 1 && nodeIndex === 0 && fg('platform_editor_element_dnd_nested_a11y') ? $pos.node($pos.depth) : $pos.nodeBefore;
-        moveToPos = $pos.depth > 1 && nodeIndex === 0 && fg('platform_editor_element_dnd_nested_a11y') ? $pos.before($pos.depth) - 1 : nodeBefore ? currentNodePos - nodeBefore.nodeSize : moveToPos;
+        if (nodeBefore) {
+          moveToPos = currentNodePos - nodeBefore.nodeSize;
+        }
       } else {
         var endOfDoc = $pos.end();
         var nodeAfterPos = $pos.posAtIndex($pos.index() + 1);

package/dist/esm/pm-plugins/handle-mouse-over.js

@@ -13,7 +13,7 @@ var isDocFirstChildEmptyLine = function isDocFirstChildEmptyLine(elem) {
   return (parentElement === null || parentElement === void 0 ? void 0 : parentElement.classList.contains('ProseMirror')) && (parentElement === null || parentElement === void 0 ? void 0 : parentElement.firstElementChild) === elem && ['P', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6'].includes(elem.nodeName) && elem.childNodes.length === 1 && ((_elem$firstElementChi = elem.firstElementChild) === null || _elem$firstElementChi === void 0 ? void 0 : _elem$firstElementChi.classList.contains('ProseMirror-trailingBreak'));
 };
 export var handleMouseOver = function handleMouseOver(view, event, api) {
-  var _api$blockControls;
+  var _api$blockControls, _target$classList;
   var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
     isDragging = _ref.isDragging,
     activeNode = _ref.activeNode;
@@ -24,7 +24,7 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     return false;
   }
   var target = event.target;
-  if (target.classList.contains('ProseMirror')) {
+  if (target !== null && target !== void 0 && (_target$classList = target.classList) !== null && _target$classList !== void 0 && _target$classList.contains('ProseMirror')) {
     return false;
   }
   var rootElement = target === null || target === void 0 ? void 0 : target.closest('[data-drag-handler-anchor-name]');

package/dist/esm/utils/getNestedNodePosition.js

@@ -9,10 +9,10 @@ export var getNestedNodePosition = function getNestedNodePosition(state) {
     if ($pos.depth < 1) {
       return nestedNodePos;
     }
-    var parentNodeOfSpecificTypes = findParentNodeOfType([state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.blockquote, state.schema.nodes.taskList])(state.selection);
+    var parentNodeOfSpecificTypes = findParentNodeOfType([state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.blockquote, state.schema.nodes.taskList, state.schema.nodes.decisionList])(state.selection);
     if (parentNodeOfSpecificTypes) {
       var parentNodeType = parentNodeOfSpecificTypes.node.type.name;
-      nestedNodePos = ['bulletList', 'orderedList'].includes(parentNodeType) ? $pos.before($pos.depth - 1) : ['blockquote', 'taskList'].includes(parentNodeType) ? $pos.before() : nestedNodePos;
+      nestedNodePos = ['bulletList', 'orderedList'].includes(parentNodeType) ? $pos.before($pos.depth - 1) : ['blockquote', 'taskList', 'decisionList'].includes(parentNodeType) ? $pos.before() : nestedNodePos;
     }
   } else {
     nestedNodePos = selection.$from.pos;

package/dist/esm/utils/getSelection.js

@@ -23,15 +23,26 @@ export var getInlineNodePos = function getInlineNodePos(tr, start, nodeSize) {
     inlineNodeEndPos: inlineNodeEndPos
   };
 };
+var isNodeWithMedia = function isNodeWithMedia(tr, start, nodeSize) {
+  var $startPos = tr.doc.resolve(start);
+  var hasMedia = false;
+  tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n) {
+    if (n.type.name === 'media') {
+      hasMedia = true;
+    }
+  });
+  return hasMedia;
+};
 export var getSelection = function getSelection(tr, start) {
   var node = tr.doc.nodeAt(start);
   var isNodeSelection = node && NodeSelection.isSelectable(node);
   var nodeSize = node ? node.nodeSize : 1;
   var $startPos = tr.doc.resolve(start);
   var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
+  var isBlockQuoteWithMedia = nodeName === 'blockquote' && isNodeWithMedia(tr, start, nodeSize);
 
   // decisionList node is not selectable, but we want to select the whole node not just text
-  if (isNodeSelection || nodeName === 'decisionList') {
+  if (isNodeSelection && nodeName !== 'blockquote' || isBlockQuoteWithMedia || nodeName === 'decisionList') {
     return new NodeSelection($startPos);
   } else if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
     var $mediaStartPos = tr.doc.resolve(start + 1);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.3.0",
+	"version": "2.4.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -30,10 +30,10 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^40.9.0",
-		"@atlaskit/editor-common": "^93.2.0",
+		"@atlaskit/adf-schema": "^40.9.4",
+		"@atlaskit/editor-common": "^93.3.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
-		"@atlaskit/editor-plugin-analytics": "^1.8.0",
+		"@atlaskit/editor-plugin-analytics": "^1.9.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-plugin-quick-insert": "^1.4.0",