@atlaskit/editor-plugin-block-controls 2.21.4 → 2.21.6

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

@@ -20,7 +20,6 @@ import { handleMouseOver } from './handle-mouse-over';
 import { boundKeydownHandler } from './keymap';
 import { defaultActiveAnchorTracker } from './utils/active-anchor-tracker';
 import { AnchorRectCache, isAnchorSupported } from './utils/anchor-utils';
-import { isBlocksDragTargetDebug } from './utils/drag-target-debug';
 import { getTrMetadata } from './utils/transactions';
 export var key = new PluginKey('blockControls');
 var EDITOR_BLOCKS_DRAG_INIT = 'Editor Blocks Drag Initialization Time';
@@ -111,10 +110,7 @@ var initialState = {
   isDocSizeLimitEnabled: null,
   isPMDragging: false
 };
-export var newApply = function newApply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+export var newApply = function newApply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache) {
   var _meta$activeNode, _activeNode, _activeNode2, _meta$activeNode$hand, _meta$isDragging, _meta$isDragging2, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging;
   var activeNode = currentState.activeNode,
     decorations = currentState.decorations,
@@ -212,14 +208,14 @@ export var newApply = function newApply(api, formatMessage, tr, currentState, ne
   var isDropTargetsMissing = ((_meta$isDragging = meta === null || meta === void 0 ? void 0 : meta.isDragging) !== null && _meta$isDragging !== void 0 ? _meta$isDragging : isDragging) && maybeNodeCountChanged && !(meta !== null && meta !== void 0 && meta.nodeMoved);
 
   // Remove drop target decorations when dragging stops or they need to be redrawn
-  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing || isBlocksDragTargetDebug()) {
+  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
     var dropTargetDecs = findDropTargetDecs(decorations);
     decorations = decorations.remove(dropTargetDecs);
   }
 
   // Add drop targets when dragging starts or some are missing
   if (api) {
-    if (meta !== null && meta !== void 0 && meta.isDragging || isDropTargetsMissing || isBlocksDragTargetDebug()) {
+    if (meta !== null && meta !== void 0 && meta.isDragging || isDropTargetsMissing) {
       var decs = dropTargetDecorations(newState, api, formatMessage, nodeViewPortalProviderAPI, latestActiveNode, anchorRectCache);
       decorations = decorations.add(newState.doc, decs);
     }
@@ -245,10 +241,7 @@ export var newApply = function newApply(api, formatMessage, tr, currentState, ne
     isPMDragging: (_meta$isPMDragging = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging !== void 0 ? _meta$isPMDragging : isPMDragging
   };
 };
-export var oldApply = function oldApply(api, formatMessage, tr, currentState, oldState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+export var oldApply = function oldApply(api, formatMessage, tr, currentState, oldState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache) {
   var _meta$activeNode2, _meta$activeNode$hand2, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2;
   var isNestedEnabled = flags.isNestedEnabled;
   var activeNode = currentState.activeNode,
@@ -361,7 +354,7 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
     var decs = dragHandleDecoration(api, formatMessage, meta.activeNode.pos, meta.activeNode.anchorName, meta.activeNode.nodeType, nodeViewPortalProviderAPI, meta.activeNode.handleOptions);
     decorations = decorations.add(newState.doc, [decs]);
   }
-  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing || isBlocksDragTargetDebug()) {
+  if ((meta === null || meta === void 0 ? void 0 : meta.isDragging) === false || isDropTargetsMissing) {
     // Remove drop target decoration when dragging stops
     var dropTargetDecs = decorations.find(undefined, undefined, function (spec) {
       return spec.type === 'drop-target-decoration';
@@ -379,7 +372,7 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
   if (api) {
     // Add drop targets when node is being dragged
     // if the transaction is only for analytics and user is dragging, continue to draw drop targets
-    if (shouldCreateDropTargets || isBlocksDragTargetDebug()) {
+    if (shouldCreateDropTargets) {
       var _meta$activeNode7;
       var _decs = dropTargetDecorations(newState, api, formatMessage, nodeViewPortalProviderAPI, isNestedEnabled ? (_meta$activeNode7 = meta === null || meta === void 0 ? void 0 : meta.activeNode) !== null && _meta$activeNode7 !== void 0 ? _meta$activeNode7 : mappedActiveNodePos : meta === null || meta === void 0 ? void 0 : meta.activeNode, anchorRectCache);
       decorations = decorations.add(newState.doc, _decs);
@@ -432,8 +425,6 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
       init: function init() {
         return initialState;
       },
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(tr, currentState, oldState, newState) {
         if (isNestedEnabled) {
           return newApply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache);

package/dist/esm/pm-plugins/utils/check-fragment.js

@@ -0,0 +1,20 @@
+/**
+ * Check if the fragment has only one node of the specified type
+ */
+export var isFragmentOfType = function isFragmentOfType(fragment, type) {
+  var _fragment$firstChild;
+  return fragment.childCount === 1 && ((_fragment$firstChild = fragment.firstChild) === null || _fragment$firstChild === void 0 ? void 0 : _fragment$firstChild.type.name) === type;
+};
+
+/**
+ * Check if the fragment contains at least a node of the specified type
+ */
+export var containsNodeOfType = function containsNodeOfType(fragment, type) {
+  for (var i = 0; i < fragment.childCount; i++) {
+    var child = fragment.child(i);
+    if (child.type.name === type) {
+      return true;
+    }
+  }
+  return false;
+};

package/dist/esm/pm-plugins/utils/drag-handle-positions.js

@@ -34,10 +34,7 @@ export var getTopPosition = function getTopPosition(dom, type) {
     return "".concat(dom.offsetTop, "px");
   }
 };
-export var getLeftPosition = function getLeftPosition(dom, type, innerContainer, macroInteractionUpdates, parentType
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+export var getLeftPosition = function getLeftPosition(dom, type, innerContainer, macroInteractionUpdates, parentType) {
   if (!dom) {
     return 'auto';
   }

package/dist/esm/pm-plugins/utils/fire-analytics.js

@@ -1,8 +1,5 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputMethod, fromDepth, fromNodeType, toDepth, toNodeType, isSameParent, api
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputMethod, fromDepth, fromNodeType, toDepth, toNodeType, isSameParent, api) {
   var _api$analytics;
   return api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 ? void 0 : _api$analytics.attachAnalyticsEvent({
     eventType: EVENT_TYPE.TRACK,

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

@@ -4,10 +4,7 @@ import { isWrappedMedia } from './check-media-layout';
 import { maxLayoutColumnSupported } from './consts';
 export var shouldAllowInlineDropTarget = function shouldAllowInlineDropTarget(isNested, node) {
   var isSameLayout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var activeNode
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
-  = arguments.length > 3 ? arguments[3] : undefined;
+  var activeNode = arguments.length > 3 ? arguments[3] : undefined;
   if (editorExperiment('advanced_layouts', false) || isNested) {
     return false;
   }

package/dist/esm/pm-plugins/utils/remove-from-source.js

@@ -1,16 +1,25 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { isFragmentOfType } from './check-fragment';
 import { MIN_LAYOUT_COLUMN } from './consts';
 import { updateColumnWidths } from './update-column-widths';
-export var removeFromSource = function removeFromSource(tr, $from) {
-  var sourceNode = $from.nodeAfter;
-  var sourceParent = $from.parent;
-  if (!sourceNode) {
+export var removeFromSource = function removeFromSource(tr, $from, to) {
+  var _sourceContent, _sourceContent2;
+  var sourceContent = $from.nodeAfter;
+  var isLayoutColumn = ((_sourceContent = sourceContent) === null || _sourceContent === void 0 ? void 0 : _sourceContent.type.name) === 'layoutColumn';
+  var sourceNodeEndPos = $from.pos + (((_sourceContent2 = sourceContent) === null || _sourceContent2 === void 0 ? void 0 : _sourceContent2.nodeSize) || 1);
+  if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
+    sourceContent = tr.doc.slice($from.pos, to).content;
+    isLayoutColumn = isFragmentOfType(sourceContent, 'layoutColumn');
+    sourceNodeEndPos = to === undefined ? $from.pos + sourceContent.size : to;
+  }
+  if (!sourceContent) {
     return tr;
   }
-  var sourceNodeEndPos = $from.pos + sourceNode.nodeSize;
-  if (sourceNode.type.name === 'layoutColumn') {
+  if (isLayoutColumn) {
+    var sourceParent = $from.parent;
     if (sourceParent.childCount === MIN_LAYOUT_COLUMN) {
       tr.delete($from.pos + 1, sourceNodeEndPos - 1);
 

package/dist/esm/pm-plugins/utils/update-column-widths.js

@@ -1,8 +1,5 @@
 import { DEFAULT_COLUMN_DISTRIBUTIONS } from '../../ui/consts';
-export var updateColumnWidths = function updateColumnWidths(tr, layoutNode, layoutNodePos, childCount
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+export var updateColumnWidths = function updateColumnWidths(tr, layoutNode, layoutNodePos, childCount) {
   var newColumnWidth = DEFAULT_COLUMN_DISTRIBUTIONS[childCount];
   if (newColumnWidth) {
     layoutNode.content.forEach(function (node, offset) {

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

@@ -70,9 +70,6 @@ export var memoizedTransformExpandToNestedExpand = memoizeOne(function (node) {
     return null;
   }
 });
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNodePos, destNode) {
   var srcNodeType = srcNode.type;
   var parentNodeType = destParent === null || destParent === void 0 ? void 0 : destParent.type.name;

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

@@ -16,7 +16,6 @@ import { B200 } from '@atlaskit/theme/colors';
 import { getNodeAnchor } from '../pm-plugins/decorations-common';
 import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
 import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
-import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
 import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
 
 // 8px gap + 16px on left and right
@@ -124,7 +123,7 @@ export var DropTargetLayout = function DropTargetLayout(props) {
     ,
     css: [dropTargetLayoutStyle, dropTargetStackLayoutHintStyle],
     "data-testid": "block-ctrl-drop-indicator"
-  }, isDraggedOver || isBlocksDragTargetDebug() ? jsx(DropIndicator, {
+  }, isDraggedOver ? jsx(DropIndicator, {
     edge: "right",
     gap: "-".concat(DROP_TARGET_LAYOUT_DROP_ZONE_WIDTH, "px")
   }) : isActiveAnchor && jsx("div", {

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

@@ -17,7 +17,6 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getNodeAnchor } from '../pm-plugins/decorations-common';
 import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
 import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
-import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
 import { shouldAllowInlineDropTarget } from '../pm-plugins/utils/inline-drop-target';
 import { getNestedNodeLeftPaddingMargin } from './consts';
 import { InlineDropTarget } from './inline-drop-target';
@@ -40,7 +39,11 @@ var styleDropIndicator = css({
   height: '100%',
   margin: '0 auto',
   position: 'relative',
-  width: "var(".concat(EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH, ", 100%)")
+  width: "var(".concat(EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_WIDTH, ", 100%)"),
+  display: 'none'
+});
+var styleDropIndicatorVisible = css({
+  display: 'block'
 });
 var nestedDropIndicatorStyle = css({
   position: 'relative'
@@ -224,10 +227,8 @@ export var DropTarget = function DropTarget(props) {
     ,
     style: dynamicStyle,
     "data-testid": "block-ctrl-drop-target"
-  },
-  // 4px gap to clear expand node border
-  (isDraggedOver || isBlocksDragTargetDebug()) && jsx("div", {
-    css: styleDropIndicator,
+  }, jsx("div", {
+    css: [styleDropIndicator, isDraggedOver && styleDropIndicatorVisible],
     "data-testid": "block-ctrl-drop-indicator"
   }, jsx(DropIndicator, {
     edge: "bottom"

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

@@ -18,7 +18,6 @@ import { B200 } from '@atlaskit/theme/colors';
 import { getNodeAnchor } from '../pm-plugins/decorations-common';
 import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
 import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
-import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
 import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
 var HOVER_ZONE_WIDTH = '--editor-blocks-inline-hover-zone-width';
 var HOVER_ZONE_HEIGHT = '--editor-blocks-inline-hover-zone-height';
@@ -247,7 +246,7 @@ export var InlineDropTarget = function InlineDropTarget(_ref) {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
     ,
     style: hoverZoneRectStyle
-  }, isDraggedOver || isBlocksDragTargetDebug() ? jsx(DropIndicator, {
+  }, isDraggedOver ? jsx(DropIndicator, {
     edge: dropIndicatorPos
   }) : isActiveAnchor && jsx("div", {
     "data-testid": "block-ctrl-drop-hint",

package/dist/types/pm-plugins/utils/check-fragment.d.ts

@@ -0,0 +1,9 @@
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Check if the fragment has only one node of the specified type
+ */
+export declare const isFragmentOfType: (fragment: Fragment, type: string) => boolean;
+/**
+ * Check if the fragment contains at least a node of the specified type
+ */
+export declare const containsNodeOfType: (fragment: Fragment, type: string) => boolean;

package/dist/types/pm-plugins/utils/remove-from-source.d.ts

@@ -1,3 +1,3 @@
 import { type ResolvedPos } from '@atlaskit/editor-prosemirror/model';
 import { type Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const removeFromSource: (tr: Transaction, $from: ResolvedPos) => Transaction;
+export declare const removeFromSource: (tr: Transaction, $from: ResolvedPos, to?: number) => Transaction;

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

@@ -0,0 +1,9 @@
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Check if the fragment has only one node of the specified type
+ */
+export declare const isFragmentOfType: (fragment: Fragment, type: string) => boolean;
+/**
+ * Check if the fragment contains at least a node of the specified type
+ */
+export declare const containsNodeOfType: (fragment: Fragment, type: string) => boolean;

package/dist/types-ts4.5/pm-plugins/utils/remove-from-source.d.ts

@@ -1,3 +1,3 @@
 import { type ResolvedPos } from '@atlaskit/editor-prosemirror/model';
 import { type Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const removeFromSource: (tr: Transaction, $from: ResolvedPos) => Transaction;
+export declare const removeFromSource: (tr: Transaction, $from: ResolvedPos, to?: number) => Transaction;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.21.4",
+	"version": "2.21.6",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,9 +31,9 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^99.3.0",
+		"@atlaskit/editor-common": "^99.5.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
-		"@atlaskit/editor-plugin-analytics": "^1.10.0",
+		"@atlaskit/editor-plugin-analytics": "^1.11.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-plugin-quick-insert": "^1.8.0",
@@ -48,8 +48,8 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.37.0",
-		"@atlaskit/tokens": "^3.1.0",
+		"@atlaskit/tmp-editor-statsig": "^2.41.0",
+		"@atlaskit/tokens": "^3.2.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -115,9 +115,6 @@
 		"platform_editor_element_drag_and_drop_ed_24321": {
 			"type": "boolean"
 		},
-		"platform_editor_element_drag_and_drop_debug": {
-			"type": "boolean"
-		},
 		"platform_editor_element_dnd_nested_fix_patch_6": {
 			"type": "boolean"
 		},

package/dist/cjs/pm-plugins/utils/drag-target-debug.js

@@ -1,11 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isBlocksDragTargetDebug = void 0;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var IS_GEMINI_TEST_ENV = Boolean(process.env.NODE_ENV === 'development') && Boolean(window.__gemini_set_feature_flag__);
-var isBlocksDragTargetDebug = exports.isBlocksDragTargetDebug = function isBlocksDragTargetDebug() {
-  return IS_GEMINI_TEST_ENV && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_debug');
-};

package/dist/es2019/pm-plugins/utils/drag-target-debug.js

@@ -1,5 +0,0 @@
-import { fg } from '@atlaskit/platform-feature-flags';
-const IS_GEMINI_TEST_ENV = Boolean(process.env.NODE_ENV === 'development') && Boolean(window.__gemini_set_feature_flag__);
-export const isBlocksDragTargetDebug = () => {
-  return IS_GEMINI_TEST_ENV && fg('platform_editor_element_drag_and_drop_debug');
-};

package/dist/esm/pm-plugins/utils/drag-target-debug.js

@@ -1,5 +0,0 @@
-import { fg } from '@atlaskit/platform-feature-flags';
-var IS_GEMINI_TEST_ENV = Boolean(process.env.NODE_ENV === 'development') && Boolean(window.__gemini_set_feature_flag__);
-export var isBlocksDragTargetDebug = function isBlocksDragTargetDebug() {
-  return IS_GEMINI_TEST_ENV && fg('platform_editor_element_drag_and_drop_debug');
-};

package/dist/types/pm-plugins/utils/drag-target-debug.d.ts

@@ -1 +0,0 @@
-export declare const isBlocksDragTargetDebug: () => boolean;

package/dist/types-ts4.5/pm-plugins/utils/drag-target-debug.d.ts

@@ -1 +0,0 @@
-export declare const isBlocksDragTargetDebug: () => boolean;