@atlaskit/editor-plugin-block-controls 1.12.0 → 1.12.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 1.12.1
+
+### Patch Changes
+
+- [#130485](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/130485)
+  [`5b6725b15e18e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5b6725b15e18e) -
+  Update node decorations when document changes for nested dnd scenarios
+- [#130711](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/130711)
+  [`f878c5be1ed97`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f878c5be1ed97) -
+  ED-24455 additional fix and tests
+- Updated dependencies
+
 ## 1.12.0
 
 ### Minor Changes

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

@@ -71,6 +71,13 @@ var destroyFn = function destroyFn(api) {
   }));
   return _combine.combine.apply(void 0, cleanupFn);
 };
+function getDocChildrenCount(newState) {
+  var size = 0;
+  newState.doc.descendants(function (node) {
+    size += node.childCount;
+  });
+  return size;
+}
 var initialState = {
   decorations: _view.DecorationSet.empty,
   decorationState: [],
@@ -82,7 +89,8 @@ var initialState = {
   editorWidthRight: 0,
   isResizerResizing: false,
   isDocSizeLimitEnabled: null,
-  isPMDragging: false
+  isPMDragging: false,
+  childCount: 0
 };
 var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
   return new _safePlugin.SafePlugin({
@@ -102,14 +110,15 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
           editorWidthRight = currentState.editorWidthRight,
           isResizerResizing = currentState.isResizerResizing,
           isDragging = currentState.isDragging,
-          isPMDragging = currentState.isPMDragging;
+          isPMDragging = currentState.isPMDragging,
+          childCount = currentState.childCount;
         var activeNodeWithNewNodeType = null;
         var meta = tr.getMeta(key);
-
+        var newChildCount = tr.docChanged && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? getDocChildrenCount(newState) : childCount;
         // If tables or media are being resized, we want to hide the drag handle
         var resizerMeta = tr.getMeta('is-resizer-resizing');
         isResizerResizing = resizerMeta !== null && resizerMeta !== void 0 ? resizerMeta : isResizerResizing;
-        var nodeCountChanged = oldState.doc.childCount !== newState.doc.childCount;
+        var nodeCountChanged = (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? childCount !== newChildCount : oldState.doc.childCount !== newState.doc.childCount;
         var shouldRemoveHandle = !tr.getMeta('isRemote');
 
         // During resize, remove the drag handle widget so its dom positioning doesn't need to be maintained
@@ -129,20 +138,26 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
           var spec = _ref6.spec;
           return spec.id === 'drag-handle';
         });
-        var decsLength = decorations.find().filter(function (_ref7) {
+        var decsLength = (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? decorations.find().filter(function (_ref7) {
           var spec = _ref7.spec;
+          return spec.type === 'node-decoration';
+        }).length : decorations.find().filter(function (_ref8) {
+          var spec = _ref8.spec;
           return spec.id !== 'drag-handle';
         }).length;
-
-        //TODO: Fix this logic for nested scenarios
-        if (!(0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+        var newNodeDecs;
+        if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
+          // naive solution while we work on performance optimised approach under ED-24503
+          newNodeDecs = (0, _decorations.nodeDecorations)(newState);
+          isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newNodeDecs.length;
+        } else {
           isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newState.doc.childCount;
         }
         var dropTargetLen = decorations.find(undefined, undefined, function (spec) {
           return spec.type === 'drop-target-decoration';
         }).length;
-
-        //TODO: Fix this logic for nested scenarios
+        var _getIntl = getIntl(),
+          formatMessage = _getIntl.formatMessage;
         if (!(0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested')) {
           isDropTargetsMissing = isDragging && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== false && dropTargetLen !== newState.doc.childCount + 1;
         }
@@ -158,17 +173,16 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
         // The activeNode is from the previous rendering cycle, and verify if they share the same anchor.
         var maybeNodeWidthUpdated = (meta === null || meta === void 0 ? void 0 : meta.activeNode) && (meta === null || meta === void 0 || (_meta$activeNode = meta.activeNode) === null || _meta$activeNode === void 0 ? void 0 : _meta$activeNode.nodeType) === 'table' && meta.activeNode.anchorName === (activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName);
         var redrawDecorations = decorations === _view.DecorationSet.empty || (meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== undefined && (meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== editorHeight || (meta === null || meta === void 0 ? void 0 : meta.editorWidthLeft) !== undefined && (meta === null || meta === void 0 ? void 0 : meta.editorWidthLeft) !== editorWidthLeft || (meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== undefined && (meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== editorWidthRight || maybeWidthUpdated || nodeCountChanged || maybeNodeWidthUpdated || resizerMeta === false || isDecsMissing || !!(meta !== null && meta !== void 0 && meta.nodeMoved) && tr.docChanged;
-        var _getIntl = getIntl(),
-          formatMessage = _getIntl.formatMessage;
 
         // Draw node and mouseWrapper decorations at top level node if decorations is empty, editor height changes or node is moved
         if (redrawDecorations && !isResizerResizing && api) {
+          var _newNodeDecs;
           var oldNodeDecs = decorations.find(undefined, undefined, function (spec) {
             return spec.type !== 'drop-target-decoration';
           });
           decorations = decorations.remove(oldNodeDecs);
-          var nodeDecs = (0, _decorations.nodeDecorations)(newState);
-          decorations = decorations.add(newState.doc, (0, _toConsumableArray2.default)(nodeDecs));
+          newNodeDecs = (_newNodeDecs = newNodeDecs) !== null && _newNodeDecs !== void 0 ? _newNodeDecs : (0, _decorations.nodeDecorations)(newState);
+          decorations = decorations.add(newState.doc, (0, _toConsumableArray2.default)(newNodeDecs));
 
           // Note: Quite often the handle is not in the right position after a node is moved
           // it is safer for now to not show it when a node is moved
@@ -247,9 +261,9 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
 
         //Map drop target decoration positions when the document changes
         if (shouldMapDropTargets) {
-          decorationState = decorationState.map(function (_ref8) {
-            var id = _ref8.id,
-              pos = _ref8.pos;
+          decorationState = decorationState.map(function (_ref9) {
+            var id = _ref9.id,
+              pos = _ref9.pos;
             return {
               id: id,
               pos: tr.mapping.map(pos)
@@ -261,9 +275,9 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
         if (shouldMapDropTargets || tr.docChanged && !redrawDecorations) {
           decorations = decorations.map(tr.mapping, tr.doc);
         }
-        var isEmptyDoc = newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
-        var hasNodeDecoration = decorations.find().some(function (_ref9) {
-          var spec = _ref9.spec;
+        var isEmptyDoc = (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_nested') ? newState.doc.childCount === 1 && newState.doc.nodeSize <= 4 && (newState.doc.firstChild === null || newState.doc.firstChild.nodeSize <= 2) : newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
+        var hasNodeDecoration = decorations.find().some(function (_ref10) {
+          var spec = _ref10.spec;
           return spec.type === 'node-decoration';
         });
         if (!hasNodeDecoration && isEmptyDoc) {
@@ -287,7 +301,8 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl) {
           editorWidthRight: (_meta$editorWidthRigh = meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== null && _meta$editorWidthRigh !== void 0 ? _meta$editorWidthRigh : currentState.editorWidthRight,
           isResizerResizing: isResizerResizing,
           isDocSizeLimitEnabled: initialState.isDocSizeLimitEnabled,
-          isPMDragging: (_meta$isPMDragging = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging !== void 0 ? _meta$isPMDragging : isPMDragging
+          isPMDragging: (_meta$isPMDragging = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging !== void 0 ? _meta$isPMDragging : isPMDragging,
+          childCount: newChildCount
         };
       }
     },

package/dist/cjs/utils/validation.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.canMoveNodeToIndex = canMoveNodeToIndex;
-exports.transformSliceExpandToNestedExpand = exports.transformExpandToNestedExpand = exports.memoizedTransformExpandToNestedExpand = exports.isNestedExpand = exports.isInsideTable = exports.isExpand = exports.isDoc = void 0;
+exports.transformSliceExpandToNestedExpand = exports.transformExpandToNestedExpand = exports.memoizedTransformExpandToNestedExpand = exports.isNestedExpand = exports.isLayoutColumn = exports.isInsideTable = exports.isExpand = exports.isDoc = void 0;
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var isInsideTable = exports.isInsideTable = function isInsideTable(nodeType) {
@@ -14,6 +14,9 @@ var isInsideTable = exports.isInsideTable = function isInsideTable(nodeType) {
     tableHeader = _nodeType$schema$node.tableHeader;
   return [tableCell, tableHeader].indexOf(nodeType) >= 0;
 };
+var isLayoutColumn = exports.isLayoutColumn = function isLayoutColumn(nodeType) {
+  return nodeType === nodeType.schema.nodes.layoutColumn;
+};
 var isDoc = exports.isDoc = function isDoc(nodeType) {
   return nodeType === nodeType.schema.nodes.doc;
 };
@@ -73,7 +76,7 @@ function canMoveNodeToIndex(destParent, indexIntoParent, srcNode) {
     } else {
       return false;
     }
-  } else if (isDoc(destParent.type) && isNestedExpand(srcNodeType)) {
+  } else if ((isDoc(destParent.type) || isLayoutColumn(destParent.type)) && isNestedExpand(srcNodeType)) {
     srcNodeType = srcNodeType.schema.nodes.expand;
   }
   return destParent.canReplaceWith(indexIntoParent, indexIntoParent, srcNodeType);

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

@@ -65,6 +65,13 @@ const destroyFn = api => {
   }));
   return combine(...cleanupFn);
 };
+function getDocChildrenCount(newState) {
+  let size = 0;
+  newState.doc.descendants(node => {
+    size += node.childCount;
+  });
+  return size;
+}
 const initialState = {
   decorations: DecorationSet.empty,
   decorationState: [],
@@ -76,7 +83,8 @@ const initialState = {
   editorWidthRight: 0,
   isResizerResizing: false,
   isDocSizeLimitEnabled: null,
-  isPMDragging: false
+  isPMDragging: false,
+  childCount: 0
 };
 export const createPlugin = (api, getIntl) => {
   return new SafePlugin({
@@ -97,15 +105,16 @@ export const createPlugin = (api, getIntl) => {
           editorWidthRight,
           isResizerResizing,
           isDragging,
-          isPMDragging
+          isPMDragging,
+          childCount
         } = currentState;
         let activeNodeWithNewNodeType = null;
         const meta = tr.getMeta(key);
-
+        const newChildCount = tr.docChanged && fg('platform_editor_elements_dnd_nested') ? getDocChildrenCount(newState) : childCount;
         // If tables or media are being resized, we want to hide the drag handle
         const resizerMeta = tr.getMeta('is-resizer-resizing');
         isResizerResizing = resizerMeta !== null && resizerMeta !== void 0 ? resizerMeta : isResizerResizing;
-        const nodeCountChanged = oldState.doc.childCount !== newState.doc.childCount;
+        const nodeCountChanged = fg('platform_editor_elements_dnd_nested') ? childCount !== newChildCount : oldState.doc.childCount !== newState.doc.childCount;
         const shouldRemoveHandle = !tr.getMeta('isRemote');
 
         // During resize, remove the drag handle widget so its dom positioning doesn't need to be maintained
@@ -123,17 +132,23 @@ export const createPlugin = (api, getIntl) => {
         const isHandleMissing = !(meta !== null && meta !== void 0 && meta.activeNode) && !decorations.find().some(({
           spec
         }) => spec.id === 'drag-handle');
-        const decsLength = decorations.find().filter(({
+        const decsLength = fg('platform_editor_elements_dnd_nested') ? decorations.find().filter(({
+          spec
+        }) => spec.type === 'node-decoration').length : decorations.find().filter(({
           spec
         }) => spec.id !== 'drag-handle').length;
-
-        //TODO: Fix this logic for nested scenarios
-        if (!fg('platform_editor_elements_dnd_nested')) {
+        let newNodeDecs;
+        if (fg('platform_editor_elements_dnd_nested')) {
+          // naive solution while we work on performance optimised approach under ED-24503
+          newNodeDecs = nodeDecorations(newState);
+          isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newNodeDecs.length;
+        } else {
           isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newState.doc.childCount;
         }
         const dropTargetLen = decorations.find(undefined, undefined, spec => spec.type === 'drop-target-decoration').length;
-
-        //TODO: Fix this logic for nested scenarios
+        const {
+          formatMessage
+        } = getIntl();
         if (!fg('platform_editor_elements_dnd_nested')) {
           isDropTargetsMissing = isDragging && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== false && dropTargetLen !== newState.doc.childCount + 1;
         }
@@ -149,16 +164,14 @@ export const createPlugin = (api, getIntl) => {
         // The activeNode is from the previous rendering cycle, and verify if they share the same anchor.
         const maybeNodeWidthUpdated = (meta === null || meta === void 0 ? void 0 : meta.activeNode) && (meta === null || meta === void 0 ? void 0 : (_meta$activeNode = meta.activeNode) === null || _meta$activeNode === void 0 ? void 0 : _meta$activeNode.nodeType) === 'table' && meta.activeNode.anchorName === (activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName);
         const redrawDecorations = decorations === DecorationSet.empty || (meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== undefined && (meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== editorHeight || (meta === null || meta === void 0 ? void 0 : meta.editorWidthLeft) !== undefined && (meta === null || meta === void 0 ? void 0 : meta.editorWidthLeft) !== editorWidthLeft || (meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== undefined && (meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== editorWidthRight || maybeWidthUpdated || nodeCountChanged || maybeNodeWidthUpdated || resizerMeta === false || isDecsMissing || !!(meta !== null && meta !== void 0 && meta.nodeMoved) && tr.docChanged;
-        const {
-          formatMessage
-        } = getIntl();
 
         // Draw node and mouseWrapper decorations at top level node if decorations is empty, editor height changes or node is moved
         if (redrawDecorations && !isResizerResizing && api) {
+          var _newNodeDecs;
           const oldNodeDecs = decorations.find(undefined, undefined, spec => spec.type !== 'drop-target-decoration');
           decorations = decorations.remove(oldNodeDecs);
-          const nodeDecs = nodeDecorations(newState);
-          decorations = decorations.add(newState.doc, [...nodeDecs]);
+          newNodeDecs = (_newNodeDecs = newNodeDecs) !== null && _newNodeDecs !== void 0 ? _newNodeDecs : nodeDecorations(newState);
+          decorations = decorations.add(newState.doc, [...newNodeDecs]);
 
           // Note: Quite often the handle is not in the right position after a node is moved
           // it is safer for now to not show it when a node is moved
@@ -245,7 +258,7 @@ export const createPlugin = (api, getIntl) => {
         if (shouldMapDropTargets || tr.docChanged && !redrawDecorations) {
           decorations = decorations.map(tr.mapping, tr.doc);
         }
-        const isEmptyDoc = newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
+        const isEmptyDoc = fg('platform_editor_elements_dnd_nested') ? newState.doc.childCount === 1 && newState.doc.nodeSize <= 4 && (newState.doc.firstChild === null || newState.doc.firstChild.nodeSize <= 2) : newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
         const hasNodeDecoration = decorations.find().some(({
           spec
         }) => spec.type === 'node-decoration');
@@ -270,7 +283,8 @@ export const createPlugin = (api, getIntl) => {
           editorWidthRight: (_meta$editorWidthRigh = meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== null && _meta$editorWidthRigh !== void 0 ? _meta$editorWidthRigh : currentState.editorWidthRight,
           isResizerResizing: isResizerResizing,
           isDocSizeLimitEnabled: initialState.isDocSizeLimitEnabled,
-          isPMDragging: (_meta$isPMDragging = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging !== void 0 ? _meta$isPMDragging : isPMDragging
+          isPMDragging: (_meta$isPMDragging = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging !== void 0 ? _meta$isPMDragging : isPMDragging,
+          childCount: newChildCount
         };
       }
     },

package/dist/es2019/utils/validation.js

@@ -7,6 +7,9 @@ export const isInsideTable = nodeType => {
   } = nodeType.schema.nodes;
   return [tableCell, tableHeader].indexOf(nodeType) >= 0;
 };
+export const isLayoutColumn = nodeType => {
+  return nodeType === nodeType.schema.nodes.layoutColumn;
+};
 export const isDoc = nodeType => {
   return nodeType === nodeType.schema.nodes.doc;
 };
@@ -67,7 +70,7 @@ export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode) {
     } else {
       return false;
     }
-  } else if (isDoc(destParent.type) && isNestedExpand(srcNodeType)) {
+  } else if ((isDoc(destParent.type) || isLayoutColumn(destParent.type)) && isNestedExpand(srcNodeType)) {
     srcNodeType = srcNodeType.schema.nodes.expand;
   }
   return destParent.canReplaceWith(indexIntoParent, indexIntoParent, srcNodeType);

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

@@ -64,6 +64,13 @@ var destroyFn = function destroyFn(api) {
   }));
   return combine.apply(void 0, cleanupFn);
 };
+function getDocChildrenCount(newState) {
+  var size = 0;
+  newState.doc.descendants(function (node) {
+    size += node.childCount;
+  });
+  return size;
+}
 var initialState = {
   decorations: DecorationSet.empty,
   decorationState: [],
@@ -75,7 +82,8 @@ var initialState = {
   editorWidthRight: 0,
   isResizerResizing: false,
   isDocSizeLimitEnabled: null,
-  isPMDragging: false
+  isPMDragging: false,
+  childCount: 0
 };
 export var createPlugin = function createPlugin(api, getIntl) {
   return new SafePlugin({
@@ -95,14 +103,15 @@ export var createPlugin = function createPlugin(api, getIntl) {
           editorWidthRight = currentState.editorWidthRight,
           isResizerResizing = currentState.isResizerResizing,
           isDragging = currentState.isDragging,
-          isPMDragging = currentState.isPMDragging;
+          isPMDragging = currentState.isPMDragging,
+          childCount = currentState.childCount;
         var activeNodeWithNewNodeType = null;
         var meta = tr.getMeta(key);
-
+        var newChildCount = tr.docChanged && fg('platform_editor_elements_dnd_nested') ? getDocChildrenCount(newState) : childCount;
         // If tables or media are being resized, we want to hide the drag handle
         var resizerMeta = tr.getMeta('is-resizer-resizing');
         isResizerResizing = resizerMeta !== null && resizerMeta !== void 0 ? resizerMeta : isResizerResizing;
-        var nodeCountChanged = oldState.doc.childCount !== newState.doc.childCount;
+        var nodeCountChanged = fg('platform_editor_elements_dnd_nested') ? childCount !== newChildCount : oldState.doc.childCount !== newState.doc.childCount;
         var shouldRemoveHandle = !tr.getMeta('isRemote');
 
         // During resize, remove the drag handle widget so its dom positioning doesn't need to be maintained
@@ -122,20 +131,26 @@ export var createPlugin = function createPlugin(api, getIntl) {
           var spec = _ref6.spec;
           return spec.id === 'drag-handle';
         });
-        var decsLength = decorations.find().filter(function (_ref7) {
+        var decsLength = fg('platform_editor_elements_dnd_nested') ? decorations.find().filter(function (_ref7) {
           var spec = _ref7.spec;
+          return spec.type === 'node-decoration';
+        }).length : decorations.find().filter(function (_ref8) {
+          var spec = _ref8.spec;
           return spec.id !== 'drag-handle';
         }).length;
-
-        //TODO: Fix this logic for nested scenarios
-        if (!fg('platform_editor_elements_dnd_nested')) {
+        var newNodeDecs;
+        if (fg('platform_editor_elements_dnd_nested')) {
+          // naive solution while we work on performance optimised approach under ED-24503
+          newNodeDecs = nodeDecorations(newState);
+          isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newNodeDecs.length;
+        } else {
           isDecsMissing = !(isDragging || meta !== null && meta !== void 0 && meta.isDragging) && decsLength !== newState.doc.childCount;
         }
         var dropTargetLen = decorations.find(undefined, undefined, function (spec) {
           return spec.type === 'drop-target-decoration';
         }).length;
-
-        //TODO: Fix this logic for nested scenarios
+        var _getIntl = getIntl(),
+          formatMessage = _getIntl.formatMessage;
         if (!fg('platform_editor_elements_dnd_nested')) {
           isDropTargetsMissing = isDragging && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== false && dropTargetLen !== newState.doc.childCount + 1;
         }
@@ -151,17 +166,16 @@ export var createPlugin = function createPlugin(api, getIntl) {
         // The activeNode is from the previous rendering cycle, and verify if they share the same anchor.
         var maybeNodeWidthUpdated = (meta === null || meta === void 0 ? void 0 : meta.activeNode) && (meta === null || meta === void 0 || (_meta$activeNode = meta.activeNode) === null || _meta$activeNode === void 0 ? void 0 : _meta$activeNode.nodeType) === 'table' && meta.activeNode.anchorName === (activeNode === null || activeNode === void 0 ? void 0 : activeNode.anchorName);
         var redrawDecorations = decorations === DecorationSet.empty || (meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== undefined && (meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== editorHeight || (meta === null || meta === void 0 ? void 0 : meta.editorWidthLeft) !== undefined && (meta === null || meta === void 0 ? void 0 : meta.editorWidthLeft) !== editorWidthLeft || (meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== undefined && (meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== editorWidthRight || maybeWidthUpdated || nodeCountChanged || maybeNodeWidthUpdated || resizerMeta === false || isDecsMissing || !!(meta !== null && meta !== void 0 && meta.nodeMoved) && tr.docChanged;
-        var _getIntl = getIntl(),
-          formatMessage = _getIntl.formatMessage;
 
         // Draw node and mouseWrapper decorations at top level node if decorations is empty, editor height changes or node is moved
         if (redrawDecorations && !isResizerResizing && api) {
+          var _newNodeDecs;
           var oldNodeDecs = decorations.find(undefined, undefined, function (spec) {
             return spec.type !== 'drop-target-decoration';
           });
           decorations = decorations.remove(oldNodeDecs);
-          var nodeDecs = nodeDecorations(newState);
-          decorations = decorations.add(newState.doc, _toConsumableArray(nodeDecs));
+          newNodeDecs = (_newNodeDecs = newNodeDecs) !== null && _newNodeDecs !== void 0 ? _newNodeDecs : nodeDecorations(newState);
+          decorations = decorations.add(newState.doc, _toConsumableArray(newNodeDecs));
 
           // Note: Quite often the handle is not in the right position after a node is moved
           // it is safer for now to not show it when a node is moved
@@ -240,9 +254,9 @@ export var createPlugin = function createPlugin(api, getIntl) {
 
         //Map drop target decoration positions when the document changes
         if (shouldMapDropTargets) {
-          decorationState = decorationState.map(function (_ref8) {
-            var id = _ref8.id,
-              pos = _ref8.pos;
+          decorationState = decorationState.map(function (_ref9) {
+            var id = _ref9.id,
+              pos = _ref9.pos;
             return {
               id: id,
               pos: tr.mapping.map(pos)
@@ -254,9 +268,9 @@ export var createPlugin = function createPlugin(api, getIntl) {
         if (shouldMapDropTargets || tr.docChanged && !redrawDecorations) {
           decorations = decorations.map(tr.mapping, tr.doc);
         }
-        var isEmptyDoc = newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
-        var hasNodeDecoration = decorations.find().some(function (_ref9) {
-          var spec = _ref9.spec;
+        var isEmptyDoc = fg('platform_editor_elements_dnd_nested') ? newState.doc.childCount === 1 && newState.doc.nodeSize <= 4 && (newState.doc.firstChild === null || newState.doc.firstChild.nodeSize <= 2) : newState.doc.childCount === 1 && newState.doc.nodeSize <= 4;
+        var hasNodeDecoration = decorations.find().some(function (_ref10) {
+          var spec = _ref10.spec;
           return spec.type === 'node-decoration';
         });
         if (!hasNodeDecoration && isEmptyDoc) {
@@ -280,7 +294,8 @@ export var createPlugin = function createPlugin(api, getIntl) {
           editorWidthRight: (_meta$editorWidthRigh = meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== null && _meta$editorWidthRigh !== void 0 ? _meta$editorWidthRigh : currentState.editorWidthRight,
           isResizerResizing: isResizerResizing,
           isDocSizeLimitEnabled: initialState.isDocSizeLimitEnabled,
-          isPMDragging: (_meta$isPMDragging = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging !== void 0 ? _meta$isPMDragging : isPMDragging
+          isPMDragging: (_meta$isPMDragging = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging !== void 0 ? _meta$isPMDragging : isPMDragging,
+          childCount: newChildCount
         };
       }
     },

package/dist/esm/utils/validation.js

@@ -6,6 +6,9 @@ export var isInsideTable = function isInsideTable(nodeType) {
     tableHeader = _nodeType$schema$node.tableHeader;
   return [tableCell, tableHeader].indexOf(nodeType) >= 0;
 };
+export var isLayoutColumn = function isLayoutColumn(nodeType) {
+  return nodeType === nodeType.schema.nodes.layoutColumn;
+};
 export var isDoc = function isDoc(nodeType) {
   return nodeType === nodeType.schema.nodes.doc;
 };
@@ -65,7 +68,7 @@ export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode) {
     } else {
       return false;
     }
-  } else if (isDoc(destParent.type) && isNestedExpand(srcNodeType)) {
+  } else if ((isDoc(destParent.type) || isLayoutColumn(destParent.type)) && isNestedExpand(srcNodeType)) {
     srcNodeType = srcNodeType.schema.nodes.expand;
   }
   return destParent.canReplaceWith(indexIntoParent, indexIntoParent, srcNodeType);

package/dist/types/types.d.ts

@@ -32,6 +32,7 @@ export interface PluginState {
      * is dragging the node without using drag handle, i,e, native prosemirror DnD
      */
     isPMDragging: boolean;
+    childCount: number;
 }
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsSharedState = {

package/dist/types/utils/validation.d.ts

@@ -1,6 +1,7 @@
 import { Slice } from '@atlaskit/editor-prosemirror/model';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 export declare const isInsideTable: (nodeType: NodeType) => Boolean;
+export declare const isLayoutColumn: (nodeType: NodeType) => Boolean;
 export declare const isDoc: (nodeType: NodeType) => Boolean;
 export declare const isExpand: (nodeType: NodeType) => Boolean;
 export declare const isNestedExpand: (nodeType: NodeType) => Boolean;

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

@@ -32,6 +32,7 @@ export interface PluginState {
      * is dragging the node without using drag handle, i,e, native prosemirror DnD
      */
     isPMDragging: boolean;
+    childCount: number;
 }
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsSharedState = {

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

@@ -1,6 +1,7 @@
 import { Slice } from '@atlaskit/editor-prosemirror/model';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 export declare const isInsideTable: (nodeType: NodeType) => Boolean;
+export declare const isLayoutColumn: (nodeType: NodeType) => Boolean;
 export declare const isDoc: (nodeType: NodeType) => Boolean;
 export declare const isExpand: (nodeType: NodeType) => Boolean;
 export declare const isNestedExpand: (nodeType: NodeType) => Boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "1.12.0",
+	"version": "1.12.1",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^87.11.0",
+		"@atlaskit/editor-common": "^87.12.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.7.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.2.0",