@atlaskit/editor-plugin-block-controls 2.13.31 → 2.14.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.14.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.14.0
+
+### Minor Changes
+
+- [#168172](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/168172)
+  [`fa404ae4155f2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fa404ae4155f2) -
+  [ux] [ED-25523] This change is adding experiment based gating to the drag and drop logic for
+  nested tables. We only allow nesting tables one level deep via drag and drop if the experiment is
+  active. Else, you cannot drag and drop a table into another table.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.13.31
 
 ### Patch Changes

package/dist/cjs/editor-commands/move-node.js

@@ -187,7 +187,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
           tr.insert(_mappedTo, fragment).setSelection(_state.Selection.near(tr.doc.resolve(_mappedTo))).scrollIntoView();
           return tr;
         }
-        if (!(0, _validation.canMoveNodeToIndex)(destParent, $to.index(), $from.node().child($from.index()))) {
+        if (!(0, _validation.canMoveNodeToIndex)(destParent, $to.index(), $from.node().child($from.index()), $to)) {
           return tr;
         }
         var convertedNodeSlice = transformSourceSlice(nodeCopy, destType);

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

@@ -225,7 +225,7 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
         }
         return shouldDescend(node); //skip over, don't consider it a valid depth
       }
-      var canDrop = activePMNode && (0, _validation.canMoveNodeToIndex)(parent, index, activePMNode, node);
+      var canDrop = activePMNode && (0, _validation.canMoveNodeToIndex)(parent, index, activePMNode, $pos, node);
 
       //NOTE: This will block drop targets showing for nodes that are valid after transformation (i.e. expand -> nestedExpand)
       if (!canDrop && !(0, _dragTargetDebug.isBlocksDragTargetDebug)()) {

package/dist/cjs/pm-plugins/utils/validation.js

@@ -7,7 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.canMoveNodeToIndex = canMoveNodeToIndex;
 exports.transformSliceExpandToNestedExpand = exports.transformExpandToNestedExpand = exports.memoizedTransformExpandToNestedExpand = exports.isNestedExpand = exports.isLayoutColumn = exports.isInsideTable = exports.isInSameLayout = exports.isExpand = exports.isDoc = void 0;
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
+var _nesting = require("@atlaskit/editor-common/nesting");
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var isInsideTable = exports.isInsideTable = function isInsideTable(nodeType) {
   var _nodeType$schema$node = nodeType.schema.nodes,
@@ -76,7 +78,7 @@ var memoizedTransformExpandToNestedExpand = exports.memoizedTransformExpandToNes
     return null;
   }
 });
-function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, destNode) {
+function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNodePos, destNode) {
   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;
@@ -100,6 +102,20 @@ function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, destNode) {
       return false;
     }
   }
+
+  // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
+  var isNestingTablesSupported = (0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes') && (0, _experiments.editorExperiment)('nested-tables-in-tables', true, {
+    exposure: true
+  });
+
+  // NOTE: this will block drop targets from showing for dragging a table into another table
+  // unless nested tables are supported and the nesting depth does not exceed 1
+  if ((parentNodeType === 'tableCell' || parentNodeType === 'tableHeader') && activeNodeType === 'table') {
+    var nestingDepth = (0, _nesting.getParentOfTypeCount)(srcNode === null || srcNode === void 0 ? void 0 : srcNode.type)($destNodePos);
+    if (!isNestingTablesSupported || isNestingTablesSupported && nestingDepth > 1) {
+      return false;
+    }
+  }
   if (isInsideTable(destParent.type) && isExpand(srcNodeType)) {
     if (memoizedTransformExpandToNestedExpand(srcNode)) {
       srcNodeType = srcNodeType.schema.nodes.nestedExpand;

package/dist/es2019/editor-commands/move-node.js

@@ -181,7 +181,7 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
       tr.insert(mappedTo, fragment).setSelection(Selection.near(tr.doc.resolve(mappedTo))).scrollIntoView();
       return tr;
     }
-    if (!canMoveNodeToIndex(destParent, $to.index(), $from.node().child($from.index()))) {
+    if (!canMoveNodeToIndex(destParent, $to.index(), $from.node().child($from.index()), $to)) {
       return tr;
     }
     const convertedNodeSlice = transformSourceSlice(nodeCopy, destType);

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

@@ -214,7 +214,7 @@ export const dropTargetDecorations = (newState, api, formatMessage, nodeViewPort
         }
         return shouldDescend(node); //skip over, don't consider it a valid depth
       }
-      const canDrop = activePMNode && canMoveNodeToIndex(parent, index, activePMNode, node);
+      const canDrop = activePMNode && canMoveNodeToIndex(parent, index, activePMNode, $pos, node);
 
       //NOTE: This will block drop targets showing for nodes that are valid after transformation (i.e. expand -> nestedExpand)
       if (!canDrop && !isBlocksDragTargetDebug()) {

package/dist/es2019/pm-plugins/utils/validation.js

@@ -1,5 +1,7 @@
 import memoizeOne from 'memoize-one';
+import { getParentOfTypeCount } from '@atlaskit/editor-common/nesting';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export const isInsideTable = nodeType => {
   const {
@@ -70,7 +72,7 @@ export const memoizedTransformExpandToNestedExpand = memoizeOne(node => {
     return null;
   }
 });
-export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, destNode) {
+export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNodePos, destNode) {
   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;
@@ -94,6 +96,20 @@ export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, destNod
       return false;
     }
   }
+
+  // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
+  const isNestingTablesSupported = fg('platform_editor_use_nested_table_pm_nodes') && editorExperiment('nested-tables-in-tables', true, {
+    exposure: true
+  });
+
+  // NOTE: this will block drop targets from showing for dragging a table into another table
+  // unless nested tables are supported and the nesting depth does not exceed 1
+  if ((parentNodeType === 'tableCell' || parentNodeType === 'tableHeader') && activeNodeType === 'table') {
+    const nestingDepth = getParentOfTypeCount(srcNode === null || srcNode === void 0 ? void 0 : srcNode.type)($destNodePos);
+    if (!isNestingTablesSupported || isNestingTablesSupported && nestingDepth > 1) {
+      return false;
+    }
+  }
   if (isInsideTable(destParent.type) && isExpand(srcNodeType)) {
     if (memoizedTransformExpandToNestedExpand(srcNode)) {
       srcNodeType = srcNodeType.schema.nodes.nestedExpand;

package/dist/esm/editor-commands/move-node.js

@@ -181,7 +181,7 @@ export var moveNode = function moveNode(api) {
           tr.insert(_mappedTo, fragment).setSelection(Selection.near(tr.doc.resolve(_mappedTo))).scrollIntoView();
           return tr;
         }
-        if (!canMoveNodeToIndex(destParent, $to.index(), $from.node().child($from.index()))) {
+        if (!canMoveNodeToIndex(destParent, $to.index(), $from.node().child($from.index()), $to)) {
           return tr;
         }
         var convertedNodeSlice = transformSourceSlice(nodeCopy, destType);

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

@@ -218,7 +218,7 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
         }
         return shouldDescend(node); //skip over, don't consider it a valid depth
       }
-      var canDrop = activePMNode && canMoveNodeToIndex(parent, index, activePMNode, node);
+      var canDrop = activePMNode && canMoveNodeToIndex(parent, index, activePMNode, $pos, node);
 
       //NOTE: This will block drop targets showing for nodes that are valid after transformation (i.e. expand -> nestedExpand)
       if (!canDrop && !isBlocksDragTargetDebug()) {

package/dist/esm/pm-plugins/utils/validation.js

@@ -1,5 +1,7 @@
 import memoizeOne from 'memoize-one';
+import { getParentOfTypeCount } from '@atlaskit/editor-common/nesting';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var isInsideTable = function isInsideTable(nodeType) {
   var _nodeType$schema$node = nodeType.schema.nodes,
@@ -68,7 +70,7 @@ export var memoizedTransformExpandToNestedExpand = memoizeOne(function (node) {
     return null;
   }
 });
-export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, destNode) {
+export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNodePos, destNode) {
   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;
@@ -92,6 +94,20 @@ export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, destNod
       return false;
     }
   }
+
+  // Place experiments here instead of just inside move-node.ts as it stops the drag marker from appearing.
+  var isNestingTablesSupported = fg('platform_editor_use_nested_table_pm_nodes') && editorExperiment('nested-tables-in-tables', true, {
+    exposure: true
+  });
+
+  // NOTE: this will block drop targets from showing for dragging a table into another table
+  // unless nested tables are supported and the nesting depth does not exceed 1
+  if ((parentNodeType === 'tableCell' || parentNodeType === 'tableHeader') && activeNodeType === 'table') {
+    var nestingDepth = getParentOfTypeCount(srcNode === null || srcNode === void 0 ? void 0 : srcNode.type)($destNodePos);
+    if (!isNestingTablesSupported || isNestingTablesSupported && nestingDepth > 1) {
+      return false;
+    }
+  }
   if (isInsideTable(destParent.type) && isExpand(srcNodeType)) {
     if (memoizedTransformExpandToNestedExpand(srcNode)) {
       srcNodeType = srcNodeType.schema.nodes.nestedExpand;

package/dist/types/pm-plugins/utils/validation.d.ts

@@ -16,4 +16,4 @@ export declare const isInSameLayout: ($from: ResolvedPos, $to: ResolvedPos) => b
 export declare const transformExpandToNestedExpand: (expandNode: PMNode) => PMNode | null;
 export declare const transformSliceExpandToNestedExpand: (slice: Slice) => Slice | null;
 export declare const memoizedTransformExpandToNestedExpand: import("memoize-one").MemoizedFn<(node: PMNode) => PMNode | null>;
-export declare function canMoveNodeToIndex(destParent: PMNode, indexIntoParent: number, srcNode: PMNode, destNode?: PMNode): boolean;
+export declare function canMoveNodeToIndex(destParent: PMNode, indexIntoParent: number, srcNode: PMNode, $destNodePos: ResolvedPos, destNode?: PMNode): boolean;

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

@@ -16,4 +16,4 @@ export declare const isInSameLayout: ($from: ResolvedPos, $to: ResolvedPos) => b
 export declare const transformExpandToNestedExpand: (expandNode: PMNode) => PMNode | null;
 export declare const transformSliceExpandToNestedExpand: (slice: Slice) => Slice | null;
 export declare const memoizedTransformExpandToNestedExpand: import("memoize-one").MemoizedFn<(node: PMNode) => PMNode | null>;
-export declare function canMoveNodeToIndex(destParent: PMNode, indexIntoParent: number, srcNode: PMNode, destNode?: PMNode): boolean;
+export declare function canMoveNodeToIndex(destParent: PMNode, indexIntoParent: number, srcNode: PMNode, $destNodePos: ResolvedPos, destNode?: PMNode): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.13.31",
+	"version": "2.14.1",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^95.10.0",
+		"@atlaskit/editor-common": "^96.0.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -162,6 +162,9 @@
 		},
 		"platform_editor_react18_plugin_portalprovider": {
 			"type": "boolean"
+		},
+		"platform_editor_use_nested_table_pm_nodes": {
+			"type": "boolean"
 		}
 	}
 }