@atlaskit/editor-plugin-block-controls 2.13.13 → 2.13.14

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.13.14
+
+### Patch Changes
+
+- [#163579](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/163579)
+  [`15dc53a3077f1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/15dc53a3077f1) -
+  Hide unnecessary inline drop targets
+- Updated dependencies
+
 ## 2.13.13
 
 ### Patch Changes

package/dist/cjs/pm-plugins/decorations-drop-target.js

@@ -163,6 +163,9 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
     if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
       depth = $pos.depth;
       if (isAdvancedLayoutsPreRelease2) {
+        if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos) === pos && activeNode.nodeType !== 'layoutColumn') {
+          return false;
+        }
         if (node.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && (parent === null || parent === void 0 ? void 0 : parent.firstChild) !== node && (
         // Not the first node
         (parent === null || parent === void 0 ? void 0 : parent.childCount) < (0, _consts.maxLayoutColumnSupported)() || isSameLayout)) {

package/dist/cjs/ui/drop-target-layout.js

@@ -39,6 +39,7 @@ var dropTargetLayoutHintStyle = (0, _react2.css)({
   width: 0
 });
 var DropTargetLayout = exports.DropTargetLayout = function DropTargetLayout(props) {
+  var _api$blockControls;
   var api = props.api,
     getPos = props.getPos,
     parent = props.parent;
@@ -51,10 +52,9 @@ var DropTargetLayout = exports.DropTargetLayout = function DropTargetLayout(prop
   var _useActiveAnchorTrack = (0, _activeAnchorTracker.useActiveAnchorTracker)(anchorName),
     _useActiveAnchorTrack2 = (0, _slicedToArray2.default)(_useActiveAnchorTrack, 1),
     isActiveAnchor = _useActiveAnchorTrack2[0];
+  var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
+    activeNode = _ref.activeNode;
   var onDrop = (0, _react.useCallback)(function () {
-    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()) || {},
-      activeNode = _ref.activeNode;
     if (!activeNode) {
       return;
     }
@@ -64,7 +64,7 @@ var DropTargetLayout = exports.DropTargetLayout = function DropTargetLayout(prop
       var from = activeNode.pos;
       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 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.moveToLayout(from, to));
     }
-  }, [api, getPos]);
+  }, [api, getPos, activeNode]);
   (0, _react.useEffect)(function () {
     if (ref.current) {
       return (0, _adapter.dropTargetForElements)({
@@ -79,6 +79,9 @@ var DropTargetLayout = exports.DropTargetLayout = function DropTargetLayout(prop
       });
     }
   }, [onDrop]);
+  if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
+    return null;
+  }
   return (0, _react2.jsx)("div", {
     ref: ref,
     css: dropTargetLayoutStyle,

package/dist/cjs/ui/drop-target-v2.js

@@ -178,7 +178,7 @@ var HoverZone = function HoverZone(_ref) {
   });
 };
 var DropTargetV2 = exports.DropTargetV2 = function DropTargetV2(props) {
-  var _dynamicStyle;
+  var _api$blockControls, _dynamicStyle;
   var api = props.api,
     getPos = props.getPos,
     prevNode = props.prevNode,
@@ -196,10 +196,9 @@ var DropTargetV2 = exports.DropTargetV2 = function DropTargetV2(props) {
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['width']),
     widthState = _useSharedPluginState.widthState;
   var isNestedDropTarget = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) !== 'doc';
+  var _ref2 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
+    activeNode = _ref2.activeNode;
   var onDrop = function onDrop() {
-    var _api$blockControls;
-    var _ref2 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
-      activeNode = _ref2.activeNode;
     if (!activeNode) {
       return;
     }
@@ -255,7 +254,7 @@ var DropTargetV2 = exports.DropTargetV2 = function DropTargetV2(props) {
     anchorRectCache: anchorRectCache,
     position: "lower",
     isNestedDropTarget: isNestedDropTarget
-  }), (0, _inlineDropTarget.shouldAllowInlineDropTarget)(isNestedDropTarget, nextNode, isSameLayout) && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_inlineDropTarget2.InlineDropTarget, (0, _extends2.default)({}, props, {
+  }), (0, _inlineDropTarget.shouldAllowInlineDropTarget)(isNestedDropTarget, nextNode, isSameLayout, activeNode) && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_inlineDropTarget2.InlineDropTarget, (0, _extends2.default)({}, props, {
     position: "left"
   })), (0, _react2.jsx)(_inlineDropTarget2.InlineDropTarget, (0, _extends2.default)({}, props, {
     position: "right"

package/dist/cjs/utils/inline-drop-target.js

@@ -10,12 +10,16 @@ var _advancedLayoutsFlags = require("./advanced-layouts-flags");
 var _checkMediaLayout = require("./check-media-layout");
 var shouldAllowInlineDropTarget = exports.shouldAllowInlineDropTarget = function shouldAllowInlineDropTarget(isNested, node) {
   var isSameLayout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var activeNode = arguments.length > 3 ? arguments[3] : undefined;
   if (!(0, _advancedLayoutsFlags.isPreRelease1)() || isNested) {
     return false;
   }
   if ((0, _checkMediaLayout.isWrappedMedia)(node)) {
     return false;
   }
+  if ((0, _advancedLayoutsFlags.isPreRelease2)() && (activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
+    return false;
+  }
   if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection') {
     return node.childCount < (0, _consts.maxLayoutColumnSupported)() || (0, _advancedLayoutsFlags.isPreRelease2)() && isSameLayout;
   }

package/dist/es2019/pm-plugins/decorations-drop-target.js

@@ -155,6 +155,9 @@ export const dropTargetDecorations = (newState, api, formatMessage, activeNode,
     if (editorExperiment('nested-dnd', true)) {
       depth = $pos.depth;
       if (isAdvancedLayoutsPreRelease2) {
+        if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos) === pos && activeNode.nodeType !== 'layoutColumn') {
+          return false;
+        }
         if (node.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && (parent === null || parent === void 0 ? void 0 : parent.firstChild) !== node && (
         // Not the first node
         (parent === null || parent === void 0 ? void 0 : parent.childCount) < maxLayoutColumnSupported() || isSameLayout)) {

package/dist/es2019/ui/drop-target-layout.js

@@ -31,6 +31,7 @@ const dropTargetLayoutHintStyle = css({
   width: 0
 });
 export const DropTargetLayout = props => {
+  var _api$blockControls;
   const {
     api,
     getPos,
@@ -40,11 +41,10 @@ export const DropTargetLayout = props => {
   const [isDraggedOver, setIsDraggedOver] = useState(false);
   const anchorName = getNodeAnchor(parent);
   const [isActiveAnchor] = useActiveAnchorTracker(anchorName);
+  const {
+    activeNode
+  } = (api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {};
   const onDrop = useCallback(() => {
-    var _api$blockControls;
-    const {
-      activeNode
-    } = (api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {};
     if (!activeNode) {
       return;
     }
@@ -56,7 +56,7 @@ export const DropTargetLayout = props => {
       } = activeNode;
       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$c = _api$blockControls2.commands) === null || _api$blockControls2$c === void 0 ? void 0 : _api$blockControls2$c.moveToLayout(from, to));
     }
-  }, [api, getPos]);
+  }, [api, getPos, activeNode]);
   useEffect(() => {
     if (ref.current) {
       return dropTargetForElements({
@@ -71,6 +71,9 @@ export const DropTargetLayout = props => {
       });
     }
   }, [onDrop]);
+  if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
+    return null;
+  }
   return jsx("div", {
     ref: ref,
     css: dropTargetLayoutStyle,

package/dist/es2019/ui/drop-target-v2.js

@@ -166,6 +166,7 @@ const HoverZone = ({
   });
 };
 export const DropTargetV2 = props => {
+  var _api$blockControls;
   const {
     api,
     getPos,
@@ -182,11 +183,10 @@ export const DropTargetV2 = props => {
     widthState
   } = useSharedPluginState(api, ['width']);
   const isNestedDropTarget = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) !== 'doc';
+  const {
+    activeNode
+  } = (api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {};
   const onDrop = () => {
-    var _api$blockControls;
-    const {
-      activeNode
-    } = (api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {};
     if (!activeNode) {
       return;
     }
@@ -239,7 +239,7 @@ export const DropTargetV2 = props => {
     anchorRectCache: anchorRectCache,
     position: "lower",
     isNestedDropTarget: isNestedDropTarget
-  }), shouldAllowInlineDropTarget(isNestedDropTarget, nextNode, isSameLayout) && jsx(Fragment, null, jsx(InlineDropTarget, _extends({}, props, {
+  }), shouldAllowInlineDropTarget(isNestedDropTarget, nextNode, isSameLayout, activeNode) && jsx(Fragment, null, jsx(InlineDropTarget, _extends({}, props, {
     position: "left"
   })), jsx(InlineDropTarget, _extends({}, props, {
     position: "right"

package/dist/es2019/utils/inline-drop-target.js

@@ -6,13 +6,16 @@ export const shouldAllowInlineDropTarget = (isNested, node,
 /**
  * Is the active node in the same layout as the target node
  */
-isSameLayout = false) => {
+isSameLayout = false, activeNode) => {
   if (!isPreRelease1() || isNested) {
     return false;
   }
   if (isWrappedMedia(node)) {
     return false;
   }
+  if (isPreRelease2() && (activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
+    return false;
+  }
   if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection') {
     return node.childCount < maxLayoutColumnSupported() || isPreRelease2() && isSameLayout;
   }

package/dist/esm/pm-plugins/decorations-drop-target.js

@@ -156,6 +156,9 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
     if (editorExperiment('nested-dnd', true)) {
       depth = $pos.depth;
       if (isAdvancedLayoutsPreRelease2) {
+        if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos) === pos && activeNode.nodeType !== 'layoutColumn') {
+          return false;
+        }
         if (node.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && (parent === null || parent === void 0 ? void 0 : parent.firstChild) !== node && (
         // Not the first node
         (parent === null || parent === void 0 ? void 0 : parent.childCount) < maxLayoutColumnSupported() || isSameLayout)) {

package/dist/esm/ui/drop-target-layout.js

@@ -32,6 +32,7 @@ var dropTargetLayoutHintStyle = css({
   width: 0
 });
 export var DropTargetLayout = function DropTargetLayout(props) {
+  var _api$blockControls;
   var api = props.api,
     getPos = props.getPos,
     parent = props.parent;
@@ -44,10 +45,9 @@ export var DropTargetLayout = function DropTargetLayout(props) {
   var _useActiveAnchorTrack = useActiveAnchorTracker(anchorName),
     _useActiveAnchorTrack2 = _slicedToArray(_useActiveAnchorTrack, 1),
     isActiveAnchor = _useActiveAnchorTrack2[0];
+  var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
+    activeNode = _ref.activeNode;
   var onDrop = useCallback(function () {
-    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()) || {},
-      activeNode = _ref.activeNode;
     if (!activeNode) {
       return;
     }
@@ -57,7 +57,7 @@ export var DropTargetLayout = function DropTargetLayout(props) {
       var from = activeNode.pos;
       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 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.moveToLayout(from, to));
     }
-  }, [api, getPos]);
+  }, [api, getPos, activeNode]);
   useEffect(function () {
     if (ref.current) {
       return dropTargetForElements({
@@ -72,6 +72,9 @@ export var DropTargetLayout = function DropTargetLayout(props) {
       });
     }
   }, [onDrop]);
+  if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
+    return null;
+  }
   return jsx("div", {
     ref: ref,
     css: dropTargetLayoutStyle,

package/dist/esm/ui/drop-target-v2.js

@@ -170,7 +170,7 @@ var HoverZone = function HoverZone(_ref) {
   });
 };
 export var DropTargetV2 = function DropTargetV2(props) {
-  var _dynamicStyle;
+  var _api$blockControls, _dynamicStyle;
   var api = props.api,
     getPos = props.getPos,
     prevNode = props.prevNode,
@@ -188,10 +188,9 @@ export var DropTargetV2 = function DropTargetV2(props) {
   var _useSharedPluginState = useSharedPluginState(api, ['width']),
     widthState = _useSharedPluginState.widthState;
   var isNestedDropTarget = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) !== 'doc';
+  var _ref2 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
+    activeNode = _ref2.activeNode;
   var onDrop = function onDrop() {
-    var _api$blockControls;
-    var _ref2 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
-      activeNode = _ref2.activeNode;
     if (!activeNode) {
       return;
     }
@@ -247,7 +246,7 @@ export var DropTargetV2 = function DropTargetV2(props) {
     anchorRectCache: anchorRectCache,
     position: "lower",
     isNestedDropTarget: isNestedDropTarget
-  }), shouldAllowInlineDropTarget(isNestedDropTarget, nextNode, isSameLayout) && jsx(Fragment, null, jsx(InlineDropTarget, _extends({}, props, {
+  }), shouldAllowInlineDropTarget(isNestedDropTarget, nextNode, isSameLayout, activeNode) && jsx(Fragment, null, jsx(InlineDropTarget, _extends({}, props, {
     position: "left"
   })), jsx(InlineDropTarget, _extends({}, props, {
     position: "right"

package/dist/esm/utils/inline-drop-target.js

@@ -4,12 +4,16 @@ import { isPreRelease1, isPreRelease2 } from './advanced-layouts-flags';
 import { isWrappedMedia } from './check-media-layout';
 export var shouldAllowInlineDropTarget = function shouldAllowInlineDropTarget(isNested, node) {
   var isSameLayout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var activeNode = arguments.length > 3 ? arguments[3] : undefined;
   if (!isPreRelease1() || isNested) {
     return false;
   }
   if (isWrappedMedia(node)) {
     return false;
   }
+  if (isPreRelease2() && (activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
+    return false;
+  }
   if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection') {
     return node.childCount < maxLayoutColumnSupported() || isPreRelease2() && isSameLayout;
   }

package/dist/types/ui/drop-target-layout.d.ts

@@ -9,4 +9,4 @@ export type DropTargetLayoutProps = {
     parent: PMNode;
     formatMessage?: IntlShape['formatMessage'];
 };
-export declare const DropTargetLayout: (props: DropTargetLayoutProps) => jsx.JSX.Element;
+export declare const DropTargetLayout: (props: DropTargetLayoutProps) => jsx.JSX.Element | null;

package/dist/types/utils/inline-drop-target.d.ts

@@ -1,2 +1,3 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-export declare const shouldAllowInlineDropTarget: (isNested: boolean, node?: PMNode, isSameLayout?: boolean) => boolean;
+import { type ActiveNode } from '../types';
+export declare const shouldAllowInlineDropTarget: (isNested: boolean, node?: PMNode, isSameLayout?: boolean, activeNode?: ActiveNode) => boolean;

package/dist/types-ts4.5/ui/drop-target-layout.d.ts

@@ -9,4 +9,4 @@ export type DropTargetLayoutProps = {
     parent: PMNode;
     formatMessage?: IntlShape['formatMessage'];
 };
-export declare const DropTargetLayout: (props: DropTargetLayoutProps) => jsx.JSX.Element;
+export declare const DropTargetLayout: (props: DropTargetLayoutProps) => jsx.JSX.Element | null;

package/dist/types-ts4.5/utils/inline-drop-target.d.ts

@@ -1,2 +1,3 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-export declare const shouldAllowInlineDropTarget: (isNested: boolean, node?: PMNode, isSameLayout?: boolean) => boolean;
+import { type ActiveNode } from '../types';
+export declare const shouldAllowInlineDropTarget: (isNested: boolean, node?: PMNode, isSameLayout?: boolean, activeNode?: ActiveNode) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.13.13",
+	"version": "2.13.14",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/primitives": "^13.2.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.15.0",
+		"@atlaskit/tmp-editor-statsig": "^2.16.0",
 		"@atlaskit/tokens": "^2.2.0",
 		"@atlaskit/tooltip": "^18.9.0",
 		"@babel/runtime": "^7.0.0",