@atlaskit/editor-plugin-block-controls 2.4.1 → 2.5.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.5.0
+
+### Minor Changes
+
+- [#151707](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/151707)
+  [`e20a1b9e9ead0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e20a1b9e9ead0) -
+  ED-25277 1 Port "nest-media-and-codeblock-in-quote" changes in drop target v2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.4.1
 
 ### Patch Changes

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

@@ -120,6 +120,8 @@ var DropTarget = exports.DropTarget = function DropTarget(_ref3) {
       return;
     }
 
+    // This should be moved to platform/packages/editor/editor-plugin-block-controls/src/utils/validation.ts
+    // Since we are moved to drop-target-v2
     // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
     if ((0, _experiments.editorExperiment)('nest-media-and-codeblock-in-quote', false)) {
       var _api$blockControls;

package/dist/cjs/utils/validation.js

@@ -8,6 +8,7 @@ exports.canMoveNodeToIndex = canMoveNodeToIndex;
 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 _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var isInsideTable = exports.isInsideTable = function isInsideTable(nodeType) {
   var _nodeType$schema$node = nodeType.schema.nodes,
     tableCell = _nodeType$schema$node.tableCell,
@@ -70,6 +71,22 @@ var memoizedTransformExpandToNestedExpand = exports.memoizedTransformExpandToNes
 });
 function canMoveNodeToIndex(destParent, indexIntoParent, srcNode) {
   var srcNodeType = srcNode.type;
+  var parentNodeType = destParent === null || destParent === void 0 ? void 0 : destParent.type.name;
+  var activeNodeType = srcNode === null || srcNode === void 0 ? void 0 : srcNode.type.name;
+
+  // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
+  if ((0, _experiments.editorExperiment)('nest-media-and-codeblock-in-quote', false)) {
+    if (parentNodeType === 'blockquote' && (activeNodeType === 'mediaGroup' || activeNodeType === 'mediaSingle' || activeNodeType === 'codeBlock')) {
+      return false;
+    }
+  }
+
+  // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
+  if ((0, _experiments.editorExperiment)('nested-expand-in-expand', false)) {
+    if (parentNodeType === 'expand' && (activeNodeType === 'expand' || activeNodeType === 'nestedExpand')) {
+      return false;
+    }
+  }
   if (isInsideTable(destParent.type) && isExpand(srcNodeType)) {
     if (memoizedTransformExpandToNestedExpand(srcNode)) {
       srcNodeType = srcNodeType.schema.nodes.nestedExpand;

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

@@ -103,6 +103,8 @@ export const DropTarget = ({
       return;
     }
 
+    // This should be moved to platform/packages/editor/editor-plugin-block-controls/src/utils/validation.ts
+    // Since we are moved to drop-target-v2
     // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
     if (editorExperiment('nest-media-and-codeblock-in-quote', false)) {
       var _api$blockControls;

package/dist/es2019/utils/validation.js

@@ -1,5 +1,6 @@
 import memoizeOne from 'memoize-one';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export const isInsideTable = nodeType => {
   const {
     tableCell,
@@ -64,6 +65,22 @@ export const memoizedTransformExpandToNestedExpand = memoizeOne(node => {
 });
 export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode) {
   let srcNodeType = srcNode.type;
+  const parentNodeType = destParent === null || destParent === void 0 ? void 0 : destParent.type.name;
+  const activeNodeType = srcNode === null || srcNode === void 0 ? void 0 : srcNode.type.name;
+
+  // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
+  if (editorExperiment('nest-media-and-codeblock-in-quote', false)) {
+    if (parentNodeType === 'blockquote' && (activeNodeType === 'mediaGroup' || activeNodeType === 'mediaSingle' || activeNodeType === 'codeBlock')) {
+      return false;
+    }
+  }
+
+  // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
+  if (editorExperiment('nested-expand-in-expand', false)) {
+    if (parentNodeType === 'expand' && (activeNodeType === 'expand' || activeNodeType === 'nestedExpand')) {
+      return false;
+    }
+  }
   if (isInsideTable(destParent.type) && isExpand(srcNodeType)) {
     if (memoizedTransformExpandToNestedExpand(srcNode)) {
       srcNodeType = srcNodeType.schema.nodes.nestedExpand;

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

@@ -112,6 +112,8 @@ export var DropTarget = function DropTarget(_ref3) {
       return;
     }
 
+    // This should be moved to platform/packages/editor/editor-plugin-block-controls/src/utils/validation.ts
+    // Since we are moved to drop-target-v2
     // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
     if (editorExperiment('nest-media-and-codeblock-in-quote', false)) {
       var _api$blockControls;

package/dist/esm/utils/validation.js

@@ -1,5 +1,6 @@
 import memoizeOne from 'memoize-one';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var isInsideTable = function isInsideTable(nodeType) {
   var _nodeType$schema$node = nodeType.schema.nodes,
     tableCell = _nodeType$schema$node.tableCell,
@@ -62,6 +63,22 @@ export var memoizedTransformExpandToNestedExpand = memoizeOne(function (node) {
 });
 export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode) {
   var srcNodeType = srcNode.type;
+  var parentNodeType = destParent === null || destParent === void 0 ? void 0 : destParent.type.name;
+  var activeNodeType = srcNode === null || srcNode === void 0 ? void 0 : srcNode.type.name;
+
+  // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
+  if (editorExperiment('nest-media-and-codeblock-in-quote', false)) {
+    if (parentNodeType === 'blockquote' && (activeNodeType === 'mediaGroup' || activeNodeType === 'mediaSingle' || activeNodeType === 'codeBlock')) {
+      return false;
+    }
+  }
+
+  // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
+  if (editorExperiment('nested-expand-in-expand', false)) {
+    if (parentNodeType === 'expand' && (activeNodeType === 'expand' || activeNodeType === 'nestedExpand')) {
+      return false;
+    }
+  }
   if (isInsideTable(destParent.type) && isExpand(srcNodeType)) {
     if (memoizedTransformExpandToNestedExpand(srcNode)) {
       srcNodeType = srcNodeType.schema.nodes.nestedExpand;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.4.1",
+	"version": "2.5.0",
 	"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.4",
-		"@atlaskit/editor-common": "^93.3.0",
+		"@atlaskit/editor-common": "^93.4.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.9.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",