@atlaskit/editor-plugin-block-controls 2.1.8 → 2.1.10

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.1.10
+
+### Patch Changes
+
+- [#147228](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/147228)
+  [`ff45a3671e9a6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ff45a3671e9a6) -
+  Remove the handle from decorations when hovering on empty paragraphs.
+
+## 2.1.9
+
+### Patch Changes
+
+- [#147660](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/147660)
+  [`bc7f5f6bfe9ff`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bc7f5f6bfe9ff) -
+  Remove nested dnd gating from analytics events
+- Updated dependencies
+
 ## 2.1.8
 
 ### Patch Changes

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

@@ -175,12 +175,11 @@ var moveNode = exports.moveNode = function moveNode(api) {
         action: _analytics.ACTION.MOVED,
         actionSubject: _analytics.ACTION_SUBJECT.ELEMENT,
         actionSubjectId: _analytics.ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-        attributes: _objectSpread(_objectSpread({
+        attributes: _objectSpread({
           nodeDepth: resolvedNode.depth,
-          nodeType: node.type.name
-        }, (0, _experiments.editorExperiment)('nested-dnd', true) && {
+          nodeType: node.type.name,
           destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth
-        }), (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873') && {
+        }, (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873') && {
           inputMethod: inputMethod
         })
       })(tr);

package/dist/cjs/plugin.js

@@ -52,9 +52,20 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
           return tr;
         };
       },
-      setNodeDragged: function setNodeDragged(getPos, anchorName, nodeType) {
+      hideDragHandle: function hideDragHandle() {
         return function (_ref5) {
           var tr = _ref5.tr;
+          if ((0, _platformFeatureFlags.fg)('confluence_frontend_page_title_enter_improvements')) {
+            tr.setMeta(_main.key, {
+              hideDragHandle: true
+            });
+          }
+          return tr;
+        };
+      },
+      setNodeDragged: function setNodeDragged(getPos, anchorName, nodeType) {
+        return function (_ref6) {
+          var tr = _ref6.tr;
           var pos = getPos();
           if (pos === undefined) {
             return tr;

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

@@ -13,6 +13,11 @@ var isEmptyNestedParagraphOrHeading = function isEmptyNestedParagraphOrHeading(t
   }
   return false;
 };
+var isDocFirstChildEmptyLine = function isDocFirstChildEmptyLine(elem) {
+  var _elem$firstElementChi;
+  var parentElement = elem.parentElement;
+  return (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 _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
@@ -31,6 +36,11 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
   var rootElement = target === null || target === void 0 ? void 0 : target.closest('[data-drag-handler-anchor-name]');
   if (rootElement) {
     var _rootElement$parentEl;
+    if (isDocFirstChildEmptyLine(rootElement) && (0, _platformFeatureFlags.fg)('confluence_frontend_page_title_enter_improvements')) {
+      var _api$core, _api$blockControls2;
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.hideDragHandle());
+      return;
+    }
     // We want to exlude handles from showing for empty paragraph and heading nodes
     if ((0, _experiments.editorExperiment)('nested-dnd', true) && isEmptyNestedParagraphOrHeading(rootElement)) {
       return false;
@@ -79,8 +89,8 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     }
     var nodeType = rootElement.getAttribute('data-drag-handler-node-type');
     if (nodeType) {
-      var _api$core, _api$blockControls2;
-      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.showDragHandleAt(rootPos, anchorName, nodeType));
+      var _api$core2, _api$blockControls3;
+      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.showDragHandleAt(rootPos, anchorName, nodeType));
     }
   }
 };

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

@@ -144,7 +144,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
         // During resize, remove the drag handle widget so its dom positioning doesn't need to be maintained
         // Also remove the handle when the node is moved or the node count changes. This helps prevent incorrect positioning
         // Don't remove the handle if remote changes are changing the node count, its prosemirror position can be mapped instead
-        if (isResizerResizing || maybeNodeCountChanged && shouldRemoveHandle || meta !== null && meta !== void 0 && meta.nodeMoved) {
+        if (meta !== null && meta !== void 0 && meta.hideDragHandle && (0, _platformFeatureFlags.fg)('confluence_frontend_page_title_enter_improvements') || isResizerResizing || maybeNodeCountChanged && shouldRemoveHandle || meta !== null && meta !== void 0 && meta.nodeMoved) {
           var oldHandle = decorations.find(undefined, undefined, function (spec) {
             return spec.id === 'drag-handle';
           });

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

@@ -172,9 +172,7 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
     attributes: {
       nodeDepth: resolvedNode.depth,
       nodeType: node.type.name,
-      ...(editorExperiment('nested-dnd', true) && {
-        destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth
-      }),
+      destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth,
       ...(fg('platform_editor_element_drag_and_drop_ed_23873') && {
         inputMethod
       })

package/dist/es2019/plugin.js

@@ -41,6 +41,16 @@ export const blockControlsPlugin = ({
       });
       return tr;
     },
+    hideDragHandle: () => ({
+      tr
+    }) => {
+      if (fg('confluence_frontend_page_title_enter_improvements')) {
+        tr.setMeta(key, {
+          hideDragHandle: true
+        });
+      }
+      return tr;
+    },
     setNodeDragged: (getPos, anchorName, nodeType) => ({
       tr
     }) => {

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

@@ -7,6 +7,11 @@ const isEmptyNestedParagraphOrHeading = target => {
   }
   return false;
 };
+const isDocFirstChildEmptyLine = elem => {
+  var _elem$firstElementChi;
+  const parentElement = elem.parentElement;
+  return (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;
   const {
@@ -26,6 +31,11 @@ export const handleMouseOver = (view, event, api) => {
   let rootElement = target === null || target === void 0 ? void 0 : target.closest('[data-drag-handler-anchor-name]');
   if (rootElement) {
     var _rootElement$parentEl;
+    if (isDocFirstChildEmptyLine(rootElement) && fg('confluence_frontend_page_title_enter_improvements')) {
+      var _api$core, _api$blockControls2;
+      api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.hideDragHandle());
+      return;
+    }
     // We want to exlude handles from showing for empty paragraph and heading nodes
     if (editorExperiment('nested-dnd', true) && isEmptyNestedParagraphOrHeading(rootElement)) {
       return false;
@@ -74,8 +84,8 @@ export const handleMouseOver = (view, event, api) => {
     }
     const nodeType = rootElement.getAttribute('data-drag-handler-node-type');
     if (nodeType) {
-      var _api$core, _api$blockControls2;
-      api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.showDragHandleAt(rootPos, anchorName, nodeType));
+      var _api$core2, _api$blockControls3;
+      api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.showDragHandleAt(rootPos, anchorName, nodeType));
     }
   }
 };

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

@@ -137,7 +137,7 @@ export const createPlugin = (api, getIntl) => {
         // During resize, remove the drag handle widget so its dom positioning doesn't need to be maintained
         // Also remove the handle when the node is moved or the node count changes. This helps prevent incorrect positioning
         // Don't remove the handle if remote changes are changing the node count, its prosemirror position can be mapped instead
-        if (isResizerResizing || maybeNodeCountChanged && shouldRemoveHandle || meta !== null && meta !== void 0 && meta.nodeMoved) {
+        if (meta !== null && meta !== void 0 && meta.hideDragHandle && fg('confluence_frontend_page_title_enter_improvements') || isResizerResizing || maybeNodeCountChanged && shouldRemoveHandle || meta !== null && meta !== void 0 && meta.nodeMoved) {
           const oldHandle = decorations.find(undefined, undefined, spec => spec.id === 'drag-handle');
           decorations = decorations.remove(oldHandle);
         }

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

@@ -169,12 +169,11 @@ export var moveNode = function moveNode(api) {
         action: ACTION.MOVED,
         actionSubject: ACTION_SUBJECT.ELEMENT,
         actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-        attributes: _objectSpread(_objectSpread({
+        attributes: _objectSpread({
           nodeDepth: resolvedNode.depth,
-          nodeType: node.type.name
-        }, editorExperiment('nested-dnd', true) && {
+          nodeType: node.type.name,
           destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth
-        }), fg('platform_editor_element_drag_and_drop_ed_23873') && {
+        }, fg('platform_editor_element_drag_and_drop_ed_23873') && {
           inputMethod: inputMethod
         })
       })(tr);

package/dist/esm/plugin.js

@@ -45,9 +45,20 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
           return tr;
         };
       },
-      setNodeDragged: function setNodeDragged(getPos, anchorName, nodeType) {
+      hideDragHandle: function hideDragHandle() {
         return function (_ref5) {
           var tr = _ref5.tr;
+          if (fg('confluence_frontend_page_title_enter_improvements')) {
+            tr.setMeta(key, {
+              hideDragHandle: true
+            });
+          }
+          return tr;
+        };
+      },
+      setNodeDragged: function setNodeDragged(getPos, anchorName, nodeType) {
+        return function (_ref6) {
+          var tr = _ref6.tr;
           var pos = getPos();
           if (pos === undefined) {
             return tr;

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

@@ -7,6 +7,11 @@ var isEmptyNestedParagraphOrHeading = function isEmptyNestedParagraphOrHeading(t
   }
   return false;
 };
+var isDocFirstChildEmptyLine = function isDocFirstChildEmptyLine(elem) {
+  var _elem$firstElementChi;
+  var parentElement = elem.parentElement;
+  return (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 _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
@@ -25,6 +30,11 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
   var rootElement = target === null || target === void 0 ? void 0 : target.closest('[data-drag-handler-anchor-name]');
   if (rootElement) {
     var _rootElement$parentEl;
+    if (isDocFirstChildEmptyLine(rootElement) && fg('confluence_frontend_page_title_enter_improvements')) {
+      var _api$core, _api$blockControls2;
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.hideDragHandle());
+      return;
+    }
     // We want to exlude handles from showing for empty paragraph and heading nodes
     if (editorExperiment('nested-dnd', true) && isEmptyNestedParagraphOrHeading(rootElement)) {
       return false;
@@ -73,8 +83,8 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     }
     var nodeType = rootElement.getAttribute('data-drag-handler-node-type');
     if (nodeType) {
-      var _api$core, _api$blockControls2;
-      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.showDragHandleAt(rootPos, anchorName, nodeType));
+      var _api$core2, _api$blockControls3;
+      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.showDragHandleAt(rootPos, anchorName, nodeType));
     }
   }
 };

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

@@ -137,7 +137,7 @@ export var createPlugin = function createPlugin(api, getIntl) {
         // During resize, remove the drag handle widget so its dom positioning doesn't need to be maintained
         // Also remove the handle when the node is moved or the node count changes. This helps prevent incorrect positioning
         // Don't remove the handle if remote changes are changing the node count, its prosemirror position can be mapped instead
-        if (isResizerResizing || maybeNodeCountChanged && shouldRemoveHandle || meta !== null && meta !== void 0 && meta.nodeMoved) {
+        if (meta !== null && meta !== void 0 && meta.hideDragHandle && fg('confluence_frontend_page_title_enter_improvements') || isResizerResizing || maybeNodeCountChanged && shouldRemoveHandle || meta !== null && meta !== void 0 && meta.nodeMoved) {
           var oldHandle = decorations.find(undefined, undefined, function (spec) {
             return spec.id === 'drag-handle';
           });

package/dist/types/types.d.ts

@@ -60,6 +60,7 @@ export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
     commands: {
         moveNode: (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape['formatMessage']) => EditorCommand;
         showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: HandleOptions) => EditorCommand;
+        hideDragHandle: () => EditorCommand;
         setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => EditorCommand;
     };
 }>;

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

@@ -60,6 +60,7 @@ export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
     commands: {
         moveNode: (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape['formatMessage']) => EditorCommand;
         showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: HandleOptions) => EditorCommand;
+        hideDragHandle: () => EditorCommand;
         setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => EditorCommand;
     };
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.1.8",
+	"version": "2.1.10",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
-		"@atlaskit/editor-common": "^92.0.0",
+		"@atlaskit/editor-common": "^92.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/primitives": "^12.2.0",
 		"@atlaskit/theme": "^13.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.1.0",
+		"@atlaskit/tmp-editor-statsig": "^2.2.0",
 		"@atlaskit/tokens": "^2.0.0",
 		"@atlaskit/tooltip": "^18.7.0",
 		"@babel/runtime": "^7.0.0",
@@ -144,6 +144,9 @@
 		},
 		"platform_editor_element_dnd_nested_type_error_fix": {
 			"type": "boolean"
+		},
+		"confluence_frontend_page_title_enter_improvements": {
+			"type": "boolean"
 		}
 	}
 }