@atlaskit/editor-plugin-block-controls 7.6.0 → 7.7.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.7.1
+
+### Patch Changes
+
+- [`27d4ba93d0702`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/27d4ba93d0702) -
+  EDITOR-3201 disable layout drop targets for sync blocks
+
+## 7.7.0
+
+### Minor Changes
+
+- [`1bfde822534e5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1bfde822534e5) -
+  EDITOR-2749 fix drag and drop issue in bodied sync block
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 7.6.0
 
 ### Minor Changes

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

@@ -18,12 +18,17 @@ var _validation = require("./utils/validation");
  * List of parent node types that can have child nodes
  */
 var PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
+var PARENT_WITH_END_DROP_TARGET_SYNC_BLOCK = [].concat(PARENT_WITH_END_DROP_TARGET, ['bodiedSyncBlock']);
 
 /**
  * List of node types that does not allow drop targets at before or after the node.
  */
 var NODE_WITH_NO_PARENT_POS = ['tableCell', 'tableHeader', 'layoutColumn'];
+var UNSUPPORTED_LAYOUT_CONTENT = ['syncBlock', 'bodiedSyncBlock'];
 var isContainerNode = function isContainerNode(node) {
+  if ((0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true)) {
+    return PARENT_WITH_END_DROP_TARGET_SYNC_BLOCK.includes(node.type.name);
+  }
   return PARENT_WITH_END_DROP_TARGET.includes(node.type.name);
 };
 var canMoveNodeOrSliceToPos = exports.canMoveNodeOrSliceToPos = function canMoveNodeOrSliceToPos(state, node, parent, index, $toPos, activeNode) {
@@ -208,7 +213,8 @@ var getActiveDropTargetDecorations = exports.getActiveDropTargetDecorations = fu
   }
   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 hasUnsupportedContent = UNSUPPORTED_LAYOUT_CONTENT.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') && (0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true);
+    if (rootNodeWithPos.node.type.name === 'layoutSection' && !hasUnsupportedContent) {
       var layoutSectionNode = rootNodeWithPos.node;
       if (layoutSectionNode.childCount < (0, _consts.maxLayoutColumnSupported)() || _isSameLayout) {
         layoutSectionNode.descendants(function (childNode, childPos, parent, index) {

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

@@ -493,7 +493,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
   if (api) {
     if ((0, _expValEquals.expValEquals)('platform_editor_block_controls_perf_optimization', 'isEnabled', true)) {
       // If page is updated while dragging (likely by remote updates), we simply remove the drop targets
-      // and add them back when the use interacts with the editor again
+      // and add them back when the user interacts with the editor again
       if (isDropTargetsMissing) {
         var oldDropTargetDecs = (0, _decorationsDropTarget.findDropTargetDecs)(decorations);
         decorations = decorations.remove(oldDropTargetDecs);

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

@@ -5,9 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.shouldAllowInlineDropTarget = void 0;
 var _utils = require("@atlaskit/editor-common/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _checkMediaLayout = require("./check-media-layout");
 var _consts = require("./consts");
+var syncedBlockTypes = ['syncBlock', 'bodiedSyncBlock'];
 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;
@@ -20,6 +22,9 @@ var shouldAllowInlineDropTarget = exports.shouldAllowInlineDropTarget = function
   if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
     return false;
   }
+  if ((syncedBlockTypes.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') || syncedBlockTypes.includes((node === null || node === void 0 ? void 0 : node.type.name) || '')) && (0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true)) {
+    return false;
+  }
   if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection') {
     return node.childCount < (0, _consts.maxLayoutColumnSupported)() || isSameLayout;
   }

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

@@ -13,12 +13,17 @@ import { canMoveNodeToIndex, canMoveSliceToIndex, isInSameLayout } from './utils
  * List of parent node types that can have child nodes
  */
 const PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
+const PARENT_WITH_END_DROP_TARGET_SYNC_BLOCK = [...PARENT_WITH_END_DROP_TARGET, 'bodiedSyncBlock'];
 
 /**
  * List of node types that does not allow drop targets at before or after the node.
  */
 const NODE_WITH_NO_PARENT_POS = ['tableCell', 'tableHeader', 'layoutColumn'];
+const UNSUPPORTED_LAYOUT_CONTENT = ['syncBlock', 'bodiedSyncBlock'];
 const isContainerNode = node => {
+  if (expValEquals('platform_synced_block', 'isEnabled', true)) {
+    return PARENT_WITH_END_DROP_TARGET_SYNC_BLOCK.includes(node.type.name);
+  }
   return PARENT_WITH_END_DROP_TARGET.includes(node.type.name);
 };
 export const canMoveNodeOrSliceToPos = (state, node, parent, index, $toPos, activeNode) => {
@@ -191,7 +196,8 @@ export const getActiveDropTargetDecorations = (activeDropTargetNode, state, api,
   }
   if (editorExperiment('advanced_layouts', true)) {
     const isSameLayout = $activeNodePos && isInSameLayout($activeNodePos, state.doc.resolve(rootNodeWithPos.pos));
-    if (rootNodeWithPos.node.type.name === 'layoutSection') {
+    const hasUnsupportedContent = UNSUPPORTED_LAYOUT_CONTENT.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') && expValEquals('platform_synced_block', 'isEnabled', true);
+    if (rootNodeWithPos.node.type.name === 'layoutSection' && !hasUnsupportedContent) {
       const layoutSectionNode = rootNodeWithPos.node;
       if (layoutSectionNode.childCount < maxLayoutColumnSupported() || isSameLayout) {
         layoutSectionNode.descendants((childNode, childPos, parent, index) => {

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

@@ -490,7 +490,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
   if (api) {
     if (expValEquals('platform_editor_block_controls_perf_optimization', 'isEnabled', true)) {
       // If page is updated while dragging (likely by remote updates), we simply remove the drop targets
-      // and add them back when the use interacts with the editor again
+      // and add them back when the user interacts with the editor again
       if (isDropTargetsMissing) {
         const oldDropTargetDecs = findDropTargetDecs(decorations);
         decorations = decorations.remove(oldDropTargetDecs);

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

@@ -1,7 +1,9 @@
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { isWrappedMedia } from './check-media-layout';
 import { maxLayoutColumnSupported } from './consts';
+const syncedBlockTypes = ['syncBlock', 'bodiedSyncBlock'];
 export const shouldAllowInlineDropTarget = (isNested, node,
 /**
  * Is the active node in the same layout as the target node
@@ -16,6 +18,9 @@ isSameLayout = false, activeNode) => {
   if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
     return false;
   }
+  if ((syncedBlockTypes.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') || syncedBlockTypes.includes((node === null || node === void 0 ? void 0 : node.type.name) || '')) && expValEquals('platform_synced_block', 'isEnabled', true)) {
+    return false;
+  }
   if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection') {
     return node.childCount < maxLayoutColumnSupported() || isSameLayout;
   }

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

@@ -13,12 +13,17 @@ import { canMoveNodeToIndex, canMoveSliceToIndex, isInSameLayout } from './utils
  * List of parent node types that can have child nodes
  */
 var PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
+var PARENT_WITH_END_DROP_TARGET_SYNC_BLOCK = [].concat(PARENT_WITH_END_DROP_TARGET, ['bodiedSyncBlock']);
 
 /**
  * List of node types that does not allow drop targets at before or after the node.
  */
 var NODE_WITH_NO_PARENT_POS = ['tableCell', 'tableHeader', 'layoutColumn'];
+var UNSUPPORTED_LAYOUT_CONTENT = ['syncBlock', 'bodiedSyncBlock'];
 var isContainerNode = function isContainerNode(node) {
+  if (expValEquals('platform_synced_block', 'isEnabled', true)) {
+    return PARENT_WITH_END_DROP_TARGET_SYNC_BLOCK.includes(node.type.name);
+  }
   return PARENT_WITH_END_DROP_TARGET.includes(node.type.name);
 };
 export var canMoveNodeOrSliceToPos = function canMoveNodeOrSliceToPos(state, node, parent, index, $toPos, activeNode) {
@@ -203,7 +208,8 @@ export var getActiveDropTargetDecorations = function getActiveDropTargetDecorati
   }
   if (editorExperiment('advanced_layouts', true)) {
     var _isSameLayout = $activeNodePos && isInSameLayout($activeNodePos, state.doc.resolve(rootNodeWithPos.pos));
-    if (rootNodeWithPos.node.type.name === 'layoutSection') {
+    var hasUnsupportedContent = UNSUPPORTED_LAYOUT_CONTENT.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') && expValEquals('platform_synced_block', 'isEnabled', true);
+    if (rootNodeWithPos.node.type.name === 'layoutSection' && !hasUnsupportedContent) {
       var layoutSectionNode = rootNodeWithPos.node;
       if (layoutSectionNode.childCount < maxLayoutColumnSupported() || _isSameLayout) {
         layoutSectionNode.descendants(function (childNode, childPos, parent, index) {

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

@@ -486,7 +486,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
   if (api) {
     if (expValEquals('platform_editor_block_controls_perf_optimization', 'isEnabled', true)) {
       // If page is updated while dragging (likely by remote updates), we simply remove the drop targets
-      // and add them back when the use interacts with the editor again
+      // and add them back when the user interacts with the editor again
       if (isDropTargetsMissing) {
         var oldDropTargetDecs = findDropTargetDecs(decorations);
         decorations = decorations.remove(oldDropTargetDecs);

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

@@ -1,7 +1,9 @@
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { isWrappedMedia } from './check-media-layout';
 import { maxLayoutColumnSupported } from './consts';
+var syncedBlockTypes = ['syncBlock', 'bodiedSyncBlock'];
 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;
@@ -14,6 +16,9 @@ export var shouldAllowInlineDropTarget = function shouldAllowInlineDropTarget(is
   if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
     return false;
   }
+  if ((syncedBlockTypes.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') || syncedBlockTypes.includes((node === null || node === void 0 ? void 0 : node.type.name) || '')) && expValEquals('platform_synced_block', 'isEnabled', true)) {
+    return false;
+  }
   if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection') {
     return node.childCount < maxLayoutColumnSupported() || isSameLayout;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "7.6.0",
+	"version": "7.7.1",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -55,7 +55,7 @@
 		"@atlaskit/theme": "^21.0.0",
 		"@atlaskit/tmp-editor-statsig": "^13.38.0",
 		"@atlaskit/tokens": "^8.0.0",
-		"@atlaskit/tooltip": "^20.8.0",
+		"@atlaskit/tooltip": "^20.9.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"@popperjs/core": "^2.11.8",
@@ -65,7 +65,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.30.0",
+		"@atlaskit/editor-common": "^110.31.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"