@atlaskit/editor-plugin-block-controls 3.2.1 → 3.3.1

package/dist/esm/pm-plugins/main.js

@@ -131,6 +131,12 @@ var destroyFn = function destroyFn(api, editorView) {
             })
           })(tr);
         }
+        if (fg('platform_editor_ease_of_use_metrics')) {
+          var _api$metrics;
+          api === null || api === void 0 || (_api$metrics = api.metrics) === null || _api$metrics === void 0 || _api$metrics.commands.startActiveSessionTimer()({
+            tr: tr
+          });
+        }
         return tr.setMeta(key, _objectSpread(_objectSpread({}, tr.getMeta(key)), {}, {
           isDragging: false,
           isPMDragging: false,
@@ -306,24 +312,23 @@ export var newApply = function newApply(api, formatMessage, tr, currentState, ne
     var oldHandle = findHandleDec(decorations, (_activeNode3 = activeNode) === null || _activeNode3 === void 0 ? void 0 : _activeNode3.pos, (_activeNode4 = activeNode) === null || _activeNode4 === void 0 ? void 0 : _activeNode4.pos);
     decorations = decorations.remove(oldHandle);
     if (editorExperiment('platform_editor_controls', 'variant1')) {
-      var _activeNode5, _activeNode6;
-      var oldQuickInsertButton = findQuickInsertInsertButtonDecoration(decorations, (_activeNode5 = activeNode) === null || _activeNode5 === void 0 ? void 0 : _activeNode5.rootPos, (_activeNode6 = activeNode) === null || _activeNode6 === void 0 ? void 0 : _activeNode6.rootPos);
+      var oldQuickInsertButton = findQuickInsertInsertButtonDecoration(decorations);
       decorations = decorations.remove(oldQuickInsertButton);
     }
   } else if (api && shouldRecreateHandle) {
-    var _activeNode7, _activeNode8;
-    var _oldHandle = findHandleDec(decorations, (_activeNode7 = activeNode) === null || _activeNode7 === void 0 ? void 0 : _activeNode7.pos, (_activeNode8 = activeNode) === null || _activeNode8 === void 0 ? void 0 : _activeNode8.pos);
+    var _activeNode5, _activeNode6;
+    var _oldHandle = findHandleDec(decorations, (_activeNode5 = activeNode) === null || _activeNode5 === void 0 ? void 0 : _activeNode5.pos, (_activeNode6 = activeNode) === null || _activeNode6 === void 0 ? void 0 : _activeNode6.pos);
     decorations = decorations.remove(_oldHandle);
     var handleDec = dragHandleDecoration(api, formatMessage, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.pos, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.anchorName, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.nodeType, nodeViewPortalProviderAPI, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.handleOptions);
     if (editorExperiment('platform_editor_controls', 'variant1')) {
-      var _activeNode9, _activeNode10;
-      var _oldQuickInsertButton = findQuickInsertInsertButtonDecoration(decorations, (_activeNode9 = activeNode) === null || _activeNode9 === void 0 ? void 0 : _activeNode9.rootPos, (_activeNode10 = activeNode) === null || _activeNode10 === void 0 ? void 0 : _activeNode10.rootPos);
-      decorations = decorations.remove(_oldQuickInsertButton);
-      var quickInsertButton = quickInsertButtonDecoration(api, formatMessage, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootPos, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.anchorName, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.nodeType, nodeViewPortalProviderAPI, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootAnchorName, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootNodeType);
-      decorations = decorations.add(newState.doc, [handleDec, quickInsertButton]);
-    } else {
-      decorations = decorations.add(newState.doc, [handleDec]);
+      if ((latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootPos) !== undefined) {
+        var _oldQuickInsertButton = findQuickInsertInsertButtonDecoration(decorations);
+        decorations = decorations.remove(_oldQuickInsertButton);
+        var quickInsertButton = quickInsertButtonDecoration(api, formatMessage, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootPos, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.anchorName, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.nodeType, nodeViewPortalProviderAPI, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootAnchorName, latestActiveNode === null || latestActiveNode === void 0 ? void 0 : latestActiveNode.rootNodeType);
+        decorations = decorations.add(newState.doc, [quickInsertButton]);
+      }
     }
+    decorations = decorations.add(newState.doc, [handleDec]);
   }
 
   // Drop targets may be missing when the node count is being changed during a drag
@@ -584,7 +589,7 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
       },
       handleDOMEvents: {
         drop: function drop(view, event) {
-          var _pluginState, _pluginState2, _pluginState3, _event$target;
+          var _pluginState, _pluginState2, _pluginState3, _event$target, _event$target$closest;
           // Prevent native DnD from triggering if we are in drag
           var dispatch = view.dispatch,
             dragging = view.dragging,
@@ -593,6 +598,12 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           var pluginState = key.getState(state);
           var dndDragCancelled = (_pluginState = pluginState) === null || _pluginState === void 0 ? void 0 : _pluginState.lastDragCancelled;
           if ((_pluginState2 = pluginState) !== null && _pluginState2 !== void 0 && _pluginState2.isPMDragging || dndDragCancelled && isMultiSelectEnabled) {
+            if (fg('platform_editor_ease_of_use_metrics')) {
+              var _api$metrics2;
+              api === null || api === void 0 || (_api$metrics2 = api.metrics) === null || _api$metrics2 === void 0 || _api$metrics2.commands.startActiveSessionTimer()({
+                tr: tr
+              });
+            }
             dispatch(tr.setMeta(key, _objectSpread(_objectSpread({}, tr.getMeta(key)), {}, {
               isPMDragging: false,
               lastDragCancelled: false
@@ -610,7 +621,7 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
             event.preventDefault();
             return false;
           }
-          var nodeElement = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest('[data-drag-handler-anchor-name]');
+          var nodeElement = (_event$target = event.target) === null || _event$target === void 0 || (_event$target$closest = _event$target.closest) === null || _event$target$closest === void 0 ? void 0 : _event$target$closest.call(_event$target, '[data-drag-handler-anchor-name]');
           if (!nodeElement) {
             return false;
           }
@@ -656,9 +667,17 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           var state = view.state,
             dispatch = view.dispatch;
           if ((_key$getState3 = key.getState(state)) !== null && _key$getState3 !== void 0 && _key$getState3.isPMDragging) {
-            dispatch(state.tr.setMeta(key, _objectSpread(_objectSpread({}, state.tr.getMeta(key)), {}, {
+            var tr = state.tr;
+            tr.setMeta(key, _objectSpread(_objectSpread({}, state.tr.getMeta(key)), {}, {
               isPMDragging: false
-            })));
+            }));
+            if (fg('platform_editor_ease_of_use_metrics')) {
+              var _api$metrics3;
+              api === null || api === void 0 || (_api$metrics3 = api.metrics) === null || _api$metrics3 === void 0 || _api$metrics3.commands.startActiveSessionTimer()({
+                tr: tr
+              });
+            }
+            dispatch(tr);
           }
         },
         mouseover: function mouseover(view, event) {

package/dist/esm/pm-plugins/utils/getSelection.js

@@ -2,6 +2,7 @@ import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 export var getInlineNodePos = function getInlineNodePos(tr, start, nodeSize) {
   var $startPos = tr.doc.resolve(start);
   // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
@@ -53,6 +54,8 @@ export var getSelection = function getSelection(tr, start) {
   // we need a quick way to make all child media nodes appear as selected without the need for a custom selection
   nodeName === 'mediaGroup') {
     return new NodeSelection($startPos);
+  } else if (nodeName === 'taskList' && fg('platform_editor_elements_dnd_multi_select_patch_1')) {
+    return TextSelection.create(tr.doc, start, start + nodeSize);
   } else {
     var _getInlineNodePos = getInlineNodePos(tr, start, nodeSize),
       inlineNodePos = _getInlineNodePos.inlineNodePos,
@@ -98,21 +101,42 @@ export var isHandleCorrelatedToSelection = function isHandleCorrelatedToSelectio
   if (selection.empty) {
     return false;
   }
+  var nodeStart;
   var $selectionFrom = selection.$from;
-  var selectionFrom = $selectionFrom.pos;
-  var nodeStart = $selectionFrom.depth ? $selectionFrom.before() : selectionFrom;
-  var $resolvedNodePos = state.doc.resolve(nodeStart);
-  if (['tableRow', 'tableCell', 'tableHeader'].includes($resolvedNodePos.node().type.name)) {
-    var parentNodeFindRes = findParentNodeOfType(state.schema.nodes['table'])(selection);
-    var tablePos = parentNodeFindRes === null || parentNodeFindRes === void 0 ? void 0 : parentNodeFindRes.pos;
-    nodeStart = typeof tablePos === 'undefined' ? nodeStart : tablePos;
-  } else if (['listItem'].includes($resolvedNodePos.node().type.name)) {
-    nodeStart = $resolvedNodePos.before(rootListDepth($resolvedNodePos));
-  } else if (['taskList'].includes($resolvedNodePos.node().type.name)) {
-    var listdepth = rootTaskListDepth($resolvedNodePos);
-    nodeStart = $resolvedNodePos.before(listdepth);
-  } else if (['blockquote'].includes($resolvedNodePos.node().type.name)) {
-    nodeStart = $resolvedNodePos.before();
+  if (fg('platform_editor_elements_dnd_multi_select_patch_1')) {
+    nodeStart = $selectionFrom.before($selectionFrom.sharedDepth(selection.to) + 1);
+    if (nodeStart === $selectionFrom.pos) {
+      nodeStart = $selectionFrom.depth ? $selectionFrom.before() : $selectionFrom.pos;
+    }
+    var $resolvedNodePos = state.doc.resolve(nodeStart);
+    if (['tableRow', 'tableCell', 'tableHeader'].includes($resolvedNodePos.node().type.name)) {
+      var parentNodeFindRes = findParentNodeOfType(state.schema.nodes['table'])(selection);
+      var tablePos = parentNodeFindRes === null || parentNodeFindRes === void 0 ? void 0 : parentNodeFindRes.pos;
+      nodeStart = typeof tablePos === 'undefined' ? nodeStart : tablePos;
+    } else if (['listItem'].includes($resolvedNodePos.node().type.name)) {
+      nodeStart = $resolvedNodePos.before(rootListDepth($resolvedNodePos));
+    } else if (['taskList'].includes($resolvedNodePos.node().type.name)) {
+      var listdepth = rootTaskListDepth($resolvedNodePos);
+      nodeStart = $resolvedNodePos.before(listdepth);
+    } else if (['blockquote'].includes($resolvedNodePos.node().type.name)) {
+      nodeStart = $resolvedNodePos.before();
+    }
+  } else {
+    var selectionFrom = $selectionFrom.pos;
+    nodeStart = $selectionFrom.depth ? $selectionFrom.before() : selectionFrom;
+    var _$resolvedNodePos = state.doc.resolve(nodeStart);
+    if (['tableRow', 'tableCell', 'tableHeader'].includes(_$resolvedNodePos.node().type.name)) {
+      var _parentNodeFindRes = findParentNodeOfType(state.schema.nodes['table'])(selection);
+      var _tablePos = _parentNodeFindRes === null || _parentNodeFindRes === void 0 ? void 0 : _parentNodeFindRes.pos;
+      nodeStart = typeof _tablePos === 'undefined' ? nodeStart : _tablePos;
+    } else if (['listItem'].includes(_$resolvedNodePos.node().type.name)) {
+      nodeStart = _$resolvedNodePos.before(rootListDepth(_$resolvedNodePos));
+    } else if (['taskList'].includes(_$resolvedNodePos.node().type.name)) {
+      var _listdepth = rootTaskListDepth(_$resolvedNodePos);
+      nodeStart = _$resolvedNodePos.before(_listdepth);
+    } else if (['blockquote'].includes(_$resolvedNodePos.node().type.name)) {
+      nodeStart = _$resolvedNodePos.before();
+    }
   }
   return Boolean(handlePos < selection.$to.pos && handlePos >= nodeStart);
 };

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

@@ -303,7 +303,7 @@ export var DragHandle = function DragHandle(_ref) {
               return tr;
             }
             var oldHandlePosCheck = handlePos >= tr.selection.$from.start() - 1 && handlePos <= tr.selection.to;
-            var newHandlePosCheck = handlePos >= (tr.selection.$from.depth ? tr.selection.$from.before() : tr.selection.from) && handlePos < tr.selection.to;
+            var newHandlePosCheck = isHandleCorrelatedToSelection(view.state, tr.selection, handlePos);
             if (!tr.selection.empty && (fg('platform_editor_elements_dnd_multi_select_patch_1') ? newHandlePosCheck : oldHandlePosCheck)) {
               var _api$blockControls4;
               api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || _api$blockControls4.commands.setMultiSelectPositions()({

package/dist/types/blockControlsPluginType.d.ts

@@ -5,6 +5,7 @@ import type { AccessibilityUtilsPlugin } from '@atlaskit/editor-plugin-accessibi
 import { type AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
+import type { MetricsPlugin } from '@atlaskit/editor-plugin-metrics';
 import type { QuickInsertPlugin } from '@atlaskit/editor-plugin-quick-insert';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
@@ -74,7 +75,8 @@ export type BlockControlsPluginDependencies = [
      * Clean up ticket ED-24824
      */
     OptionalPlugin<QuickInsertPlugin>,
-    OptionalPlugin<SelectionPlugin>
+    OptionalPlugin<SelectionPlugin>,
+    OptionalPlugin<MetricsPlugin>
 ];
 export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
     dependencies: BlockControlsPluginDependencies;

package/dist/types/ui/block-menu.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { EditorView } from '@atlaskit/editor-prosemirror/dist/types/view';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { BlockControlsPlugin } from '../blockControlsPluginType';
 type BlockMenuProps = {
     editorView: EditorView | undefined;

package/dist/types-ts4.5/blockControlsPluginType.d.ts

@@ -5,6 +5,7 @@ import type { AccessibilityUtilsPlugin } from '@atlaskit/editor-plugin-accessibi
 import { type AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
+import type { MetricsPlugin } from '@atlaskit/editor-plugin-metrics';
 import type { QuickInsertPlugin } from '@atlaskit/editor-plugin-quick-insert';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
@@ -74,7 +75,8 @@ export type BlockControlsPluginDependencies = [
      * Clean up ticket ED-24824
      */
     OptionalPlugin<QuickInsertPlugin>,
-    OptionalPlugin<SelectionPlugin>
+    OptionalPlugin<SelectionPlugin>,
+    OptionalPlugin<MetricsPlugin>
 ];
 export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
     dependencies: BlockControlsPluginDependencies;

package/dist/types-ts4.5/ui/block-menu.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { EditorView } from '@atlaskit/editor-prosemirror/dist/types/view';
+import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { BlockControlsPlugin } from '../blockControlsPluginType';
 type BlockMenuProps = {
     editorView: EditorView | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.2.1",
+	"version": "3.3.1",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,11 +33,12 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^101.0.0",
+		"@atlaskit/editor-common": "^101.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.1.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.3.0",
+		"@atlaskit/editor-plugin-metrics": "^3.4.0",
 		"@atlaskit/editor-plugin-quick-insert": "^2.0.0",
 		"@atlaskit/editor-plugin-selection": "^2.0.0",
 		"@atlaskit/editor-plugin-width": "^3.0.0",
@@ -162,6 +163,9 @@
 		},
 		"platform_editor_elements_dnd_select_node_on_drag": {
 			"type": "boolean"
+		},
+		"platform_editor_ease_of_use_metrics": {
+			"type": "boolean"
 		}
 	}
 }