@atlaskit/editor-plugin-block-controls 3.18.0 → 3.19.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.19.0
+
+### Minor Changes
+
+- [#170348](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/170348)
+  [`8f9510a71c843`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8f9510a71c843) -
+  ED-28158 implement active advanced layout drop targets
+
 ## 3.18.0
 
 ### Minor Changes

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

@@ -11,6 +11,7 @@ var _decorationsCommon = require("./decorations-common");
 var _decorationsDropTarget = require("./decorations-drop-target");
 var _decorationsFindSurroundingNodes = require("./decorations-find-surrounding-nodes");
 var _activeAnchorTracker = require("./utils/active-anchor-tracker");
+var _consts = require("./utils/consts");
 var _validation = require("./utils/validation");
 /**
  * List of parent node types that can have child nodes
@@ -134,6 +135,10 @@ var getActiveDropTargetDecorations = exports.getActiveDropTargetDecorations = fu
       }, nodeViewPortalProviderAPI, -1, undefined, isSameLayout));
     }
   }
+  var rootNodeWithPos = {
+    node: node,
+    pos: pos
+  };
 
   // if the current node is not a top level node, we create one for advanced layout drop targets
   if (depth > 1) {
@@ -146,9 +151,30 @@ var getActiveDropTargetDecorations = exports.getActiveDropTargetDecorations = fu
       formatMessage: formatMessage,
       dropTargetStyle: 'default'
     }, nodeViewPortalProviderAPI, 0, undefined, false));
-    _activeAnchorTracker.defaultActiveAnchorTracker.emit((0, _decorationsCommon.getNodeAnchor)(root.node));
-  } else {
-    _activeAnchorTracker.defaultActiveAnchorTracker.emit((0, _decorationsCommon.getNodeAnchor)(node));
+    rootNodeWithPos = {
+      node: root.node,
+      pos: root.pos
+    };
+  }
+  if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
+    var _isSameLayout = $activeNodePos && (0, _validation.isInSameLayout)($activeNodePos, state.doc.resolve(rootNodeWithPos.pos));
+    if (rootNodeWithPos.node.type.name === 'layoutSection') {
+      var layoutSectionNode = rootNodeWithPos.node;
+      if (layoutSectionNode.childCount < (0, _consts.maxLayoutColumnSupported)() || _isSameLayout) {
+        layoutSectionNode.descendants(function (childNode, childPos, parent, index) {
+          if (childNode.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && index !== 0 // Not the first node
+          ) {
+            decs.push((0, _decorationsDropTarget.createLayoutDropTargetDecoration)(rootNodeWithPos.pos + childPos + 1, {
+              api: api,
+              parent: parent,
+              formatMessage: formatMessage
+            }, nodeViewPortalProviderAPI, undefined));
+          }
+          return false;
+        });
+      }
+    }
   }
+  _activeAnchorTracker.defaultActiveAnchorTracker.emit((0, _decorationsCommon.getNodeAnchor)(rootNodeWithPos.node));
   return decs;
 };

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

@@ -2,9 +2,10 @@ import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getNodeAnchor, unmountDecorations } from './decorations-common';
-import { createDropTargetDecoration } from './decorations-drop-target';
+import { createDropTargetDecoration, createLayoutDropTargetDecoration } from './decorations-drop-target';
 import { findSurroundingNodes } from './decorations-find-surrounding-nodes';
 import { defaultActiveAnchorTracker } from './utils/active-anchor-tracker';
+import { maxLayoutColumnSupported } from './utils/consts';
 import { canMoveNodeToIndex, canMoveSliceToIndex, isInSameLayout } from './utils/validation';
 
 /**
@@ -131,6 +132,10 @@ export const getActiveDropTargetDecorations = (activeDropTargetNode, state, api,
       }, nodeViewPortalProviderAPI, -1, undefined, isSameLayout));
     }
   }
+  let rootNodeWithPos = {
+    node,
+    pos
+  };
 
   // if the current node is not a top level node, we create one for advanced layout drop targets
   if (depth > 1) {
@@ -143,9 +148,30 @@ export const getActiveDropTargetDecorations = (activeDropTargetNode, state, api,
       formatMessage,
       dropTargetStyle: 'default'
     }, nodeViewPortalProviderAPI, 0, undefined, false));
-    defaultActiveAnchorTracker.emit(getNodeAnchor(root.node));
-  } else {
-    defaultActiveAnchorTracker.emit(getNodeAnchor(node));
+    rootNodeWithPos = {
+      node: root.node,
+      pos: root.pos
+    };
+  }
+  if (editorExperiment('advanced_layouts', true)) {
+    const isSameLayout = $activeNodePos && isInSameLayout($activeNodePos, state.doc.resolve(rootNodeWithPos.pos));
+    if (rootNodeWithPos.node.type.name === 'layoutSection') {
+      const layoutSectionNode = rootNodeWithPos.node;
+      if (layoutSectionNode.childCount < maxLayoutColumnSupported() || isSameLayout) {
+        layoutSectionNode.descendants((childNode, childPos, parent, index) => {
+          if (childNode.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && index !== 0 // Not the first node
+          ) {
+            decs.push(createLayoutDropTargetDecoration(rootNodeWithPos.pos + childPos + 1, {
+              api,
+              parent,
+              formatMessage
+            }, nodeViewPortalProviderAPI, undefined));
+          }
+          return false;
+        });
+      }
+    }
   }
+  defaultActiveAnchorTracker.emit(getNodeAnchor(rootNodeWithPos.node));
   return decs;
 };

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

@@ -2,9 +2,10 @@ import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getNodeAnchor, unmountDecorations } from './decorations-common';
-import { createDropTargetDecoration } from './decorations-drop-target';
+import { createDropTargetDecoration, createLayoutDropTargetDecoration } from './decorations-drop-target';
 import { findSurroundingNodes } from './decorations-find-surrounding-nodes';
 import { defaultActiveAnchorTracker } from './utils/active-anchor-tracker';
+import { maxLayoutColumnSupported } from './utils/consts';
 import { canMoveNodeToIndex, canMoveSliceToIndex, isInSameLayout } from './utils/validation';
 
 /**
@@ -129,6 +130,10 @@ export var getActiveDropTargetDecorations = function getActiveDropTargetDecorati
       }, nodeViewPortalProviderAPI, -1, undefined, isSameLayout));
     }
   }
+  var rootNodeWithPos = {
+    node: node,
+    pos: pos
+  };
 
   // if the current node is not a top level node, we create one for advanced layout drop targets
   if (depth > 1) {
@@ -141,9 +146,30 @@ export var getActiveDropTargetDecorations = function getActiveDropTargetDecorati
       formatMessage: formatMessage,
       dropTargetStyle: 'default'
     }, nodeViewPortalProviderAPI, 0, undefined, false));
-    defaultActiveAnchorTracker.emit(getNodeAnchor(root.node));
-  } else {
-    defaultActiveAnchorTracker.emit(getNodeAnchor(node));
+    rootNodeWithPos = {
+      node: root.node,
+      pos: root.pos
+    };
+  }
+  if (editorExperiment('advanced_layouts', true)) {
+    var _isSameLayout = $activeNodePos && isInSameLayout($activeNodePos, state.doc.resolve(rootNodeWithPos.pos));
+    if (rootNodeWithPos.node.type.name === 'layoutSection') {
+      var layoutSectionNode = rootNodeWithPos.node;
+      if (layoutSectionNode.childCount < maxLayoutColumnSupported() || _isSameLayout) {
+        layoutSectionNode.descendants(function (childNode, childPos, parent, index) {
+          if (childNode.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && index !== 0 // Not the first node
+          ) {
+            decs.push(createLayoutDropTargetDecoration(rootNodeWithPos.pos + childPos + 1, {
+              api: api,
+              parent: parent,
+              formatMessage: formatMessage
+            }, nodeViewPortalProviderAPI, undefined));
+          }
+          return false;
+        });
+      }
+    }
   }
+  defaultActiveAnchorTracker.emit(getNodeAnchor(rootNodeWithPos.node));
   return decs;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.18.0",
+	"version": "3.19.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",