@atlaskit/editor-plugin-block-controls 3.5.2 → 3.5.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.5.3
+
+### Patch Changes
+
+- [#131048](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/131048)
+  [`40f0ae20820a0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/40f0ae20820a0) -
+  Clean up platform_editor_advanced_layouts_a11y
+- [#128309](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/128309)
+  [`5668591816f6a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5668591816f6a) -
+  Clean up platform_editor_advanced_layouts_dnd_remove_layout
+- [#130397](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/130397)
+  [`632086ddddec2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/632086ddddec2) -
+  [ux] fix drag handlers for multibodied extensions
+- Updated dependencies
+
 ## 3.5.2
 
 ### Patch Changes

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

@@ -131,7 +131,6 @@ var getFocusedHandle = function getFocusedHandle(state) {
 };
 var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, formatMessage) {
   return function (state) {
-    var _hoistedPos;
     var isParentNodeOfTypeLayout;
     var shouldEnableNestedDndA11y = (0, _experiments.editorExperiment)('nested-dnd', true);
     var selection = state.selection;
@@ -149,7 +148,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
       var LAYOUT_COL_DEPTH = 3;
       hoistedPos = state.doc.resolve(from).before(LAYOUT_COL_DEPTH);
     }
-    var currentNodePos = isMultiSelectEnabled && !getFocusedHandle(state) && !selection.empty ? (_hoistedPos = hoistedPos) !== null && _hoistedPos !== void 0 ? _hoistedPos : from : getCurrentNodePos(state);
+    var currentNodePos = isMultiSelectEnabled && !getFocusedHandle(state) && !selection.empty ? hoistedPos !== null && hoistedPos !== void 0 ? hoistedPos : from : getCurrentNodePos(state);
     if (currentNodePos > -1) {
       var _state$doc$nodeAt;
       var $currentNodePos = state.doc.resolve(currentNodePos);

package/dist/cjs/editor-commands/show-drag-handle.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.showDragHandleAtSelection = void 0;
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-tables/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _decorationsAnchor = require("../pm-plugins/decorations-anchor");
 var _main = require("../pm-plugins/main");
@@ -152,6 +151,6 @@ var showDragHandleAtSelectionNew = function showDragHandleAtSelectionNew(api) {
 };
 var showDragHandleAtSelection = exports.showDragHandleAtSelection = function showDragHandleAtSelection(api) {
   return function (state, dispatch, view) {
-    return (0, _experiments.editorExperiment)('nested-dnd', true) && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_a11y') ? showDragHandleAtSelectionNew(api)(state) : showDragHandleAtSelectionOld(api)(state, dispatch, view);
+    return (0, _experiments.editorExperiment)('nested-dnd', true) ? showDragHandleAtSelectionNew(api)(state) : showDragHandleAtSelectionOld(api)(state, dispatch, view);
   };
 };

package/dist/cjs/pm-plugins/handle-mouse-over.js

@@ -114,8 +114,8 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     var nodeType = rootElement.getAttribute('data-drag-handler-node-type');
     if (nodeType) {
       if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
-        var _api$core, _api$blockControls2, _rootPos, _rootAnchorName, _rootNodeType;
-        api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.showDragHandleAt(targetPos, anchorName, nodeType, undefined, (_rootPos = rootPos) !== null && _rootPos !== void 0 ? _rootPos : targetPos, (_rootAnchorName = rootAnchorName) !== null && _rootAnchorName !== void 0 ? _rootAnchorName : anchorName, (_rootNodeType = rootNodeType) !== null && _rootNodeType !== void 0 ? _rootNodeType : nodeType));
+        var _api$core, _api$blockControls2;
+        api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.showDragHandleAt(targetPos, anchorName, nodeType, undefined, rootPos !== null && rootPos !== void 0 ? rootPos : targetPos, rootAnchorName !== null && rootAnchorName !== void 0 ? rootAnchorName : anchorName, rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType));
       } else {
         var _api$core2, _api$blockControls3;
         api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.showDragHandleAt(targetPos, anchorName, nodeType));

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.removeFromSource = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _checkFragment = require("./check-fragment");
 var _consts = require("./consts");
@@ -31,7 +30,7 @@ var removeFromSource = exports.removeFromSource = function removeFromSource(tr,
 
       // Currently, we assume that the MIN_LAYOUT_COLUMN is set to 2.
       // This value may require an update when we introduce support for a single-column layout.
-      if (sourceParent.childCount === 2 && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_dnd_remove_layout')) {
+      if (sourceParent.childCount === 2) {
         var _$from$parent$lastChi, _$from$parent$firstCh;
         var layoutContentFragment = $from.parentOffset === 0 ? _model.Fragment.from((_$from$parent$lastChi = $from.parent.lastChild) === null || _$from$parent$lastChi === void 0 ? void 0 : _$from$parent$lastChi.content) : _model.Fragment.from((_$from$parent$firstCh = $from.parent.firstChild) === null || _$from$parent$firstCh === void 0 ? void 0 : _$from$parent$firstCh.content);
         var parent = (0, _utils.findParentNodeClosestToPos)($from, function (node) {

package/dist/cjs/ui/drag-handle.js

@@ -472,7 +472,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     var supportsAnchor = CSS.supports('top', "anchor(".concat(anchorName, " start)")) && CSS.supports('left', "anchor(".concat(anchorName, " start)"));
     var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
     var hasResizer = nodeType === 'table' || nodeType === 'mediaSingle';
-    var isExtension = nodeType === 'extension' || nodeType === 'bodiedExtension';
+    var isExtension = nodeType === 'extension' || nodeType === 'bodiedExtension' || nodeType === 'multiBodiedExtension' && (0, _platformFeatureFlags.fg)('platform_editor_multi_body_extension_extensibility');
     var isBlockCard = nodeType === 'blockCard' && !!blockCardWidth;
     var isEmbedCard = nodeType === 'embedCard';
     var isMacroInteractionUpdates = macroInteractionUpdates && isExtension;

package/dist/es2019/editor-commands/show-drag-handle.js

@@ -1,6 +1,5 @@
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { isInTable } from '@atlaskit/editor-tables/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { findNodeDecs } from '../pm-plugins/decorations-anchor';
 import { getDecorations, key } from '../pm-plugins/main';
@@ -148,4 +147,4 @@ const showDragHandleAtSelectionNew = api => state => {
   }
   return false;
 };
-export const showDragHandleAtSelection = api => (state, dispatch, view) => editorExperiment('nested-dnd', true) && fg('platform_editor_advanced_layouts_a11y') ? showDragHandleAtSelectionNew(api)(state) : showDragHandleAtSelectionOld(api)(state, dispatch, view);
+export const showDragHandleAtSelection = api => (state, dispatch, view) => editorExperiment('nested-dnd', true) ? showDragHandleAtSelectionNew(api)(state) : showDragHandleAtSelectionOld(api)(state, dispatch, view);

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

@@ -1,6 +1,5 @@
 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';
@@ -25,7 +24,7 @@ export const removeFromSource = (tr, $from, to) => {
 
       // Currently, we assume that the MIN_LAYOUT_COLUMN is set to 2.
       // This value may require an update when we introduce support for a single-column layout.
-      if (sourceParent.childCount === 2 && fg('platform_editor_advanced_layouts_dnd_remove_layout')) {
+      if (sourceParent.childCount === 2) {
         var _$from$parent$lastChi, _$from$parent$firstCh;
         const layoutContentFragment = $from.parentOffset === 0 ? Fragment.from((_$from$parent$lastChi = $from.parent.lastChild) === null || _$from$parent$lastChi === void 0 ? void 0 : _$from$parent$lastChi.content) : Fragment.from((_$from$parent$firstCh = $from.parent.firstChild) === null || _$from$parent$firstCh === void 0 ? void 0 : _$from$parent$firstCh.content);
         const parent = findParentNodeClosestToPos($from, node => {

package/dist/es2019/ui/drag-handle.js

@@ -461,7 +461,7 @@ export const DragHandle = ({
     const supportsAnchor = CSS.supports('top', `anchor(${anchorName} start)`) && CSS.supports('left', `anchor(${anchorName} start)`);
     const dom = view.dom.querySelector(`[data-drag-handler-anchor-name="${anchorName}"]`);
     const hasResizer = nodeType === 'table' || nodeType === 'mediaSingle';
-    const isExtension = nodeType === 'extension' || nodeType === 'bodiedExtension';
+    const isExtension = nodeType === 'extension' || nodeType === 'bodiedExtension' || nodeType === 'multiBodiedExtension' && fg('platform_editor_multi_body_extension_extensibility');
     const isBlockCard = nodeType === 'blockCard' && !!blockCardWidth;
     const isEmbedCard = nodeType === 'embedCard';
     const isMacroInteractionUpdates = macroInteractionUpdates && isExtension;

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

@@ -125,7 +125,6 @@ var getFocusedHandle = function getFocusedHandle(state) {
 };
 export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, formatMessage) {
   return function (state) {
-    var _hoistedPos;
     var isParentNodeOfTypeLayout;
     var shouldEnableNestedDndA11y = editorExperiment('nested-dnd', true);
     var selection = state.selection;
@@ -143,7 +142,7 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
       var LAYOUT_COL_DEPTH = 3;
       hoistedPos = state.doc.resolve(from).before(LAYOUT_COL_DEPTH);
     }
-    var currentNodePos = isMultiSelectEnabled && !getFocusedHandle(state) && !selection.empty ? (_hoistedPos = hoistedPos) !== null && _hoistedPos !== void 0 ? _hoistedPos : from : getCurrentNodePos(state);
+    var currentNodePos = isMultiSelectEnabled && !getFocusedHandle(state) && !selection.empty ? hoistedPos !== null && hoistedPos !== void 0 ? hoistedPos : from : getCurrentNodePos(state);
     if (currentNodePos > -1) {
       var _state$doc$nodeAt;
       var $currentNodePos = state.doc.resolve(currentNodePos);

package/dist/esm/editor-commands/show-drag-handle.js

@@ -1,6 +1,5 @@
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { isInTable } from '@atlaskit/editor-tables/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { findNodeDecs } from '../pm-plugins/decorations-anchor';
 import { getDecorations, key } from '../pm-plugins/main';
@@ -146,6 +145,6 @@ var showDragHandleAtSelectionNew = function showDragHandleAtSelectionNew(api) {
 };
 export var showDragHandleAtSelection = function showDragHandleAtSelection(api) {
   return function (state, dispatch, view) {
-    return editorExperiment('nested-dnd', true) && fg('platform_editor_advanced_layouts_a11y') ? showDragHandleAtSelectionNew(api)(state) : showDragHandleAtSelectionOld(api)(state, dispatch, view);
+    return editorExperiment('nested-dnd', true) ? showDragHandleAtSelectionNew(api)(state) : showDragHandleAtSelectionOld(api)(state, dispatch, view);
   };
 };

package/dist/esm/pm-plugins/handle-mouse-over.js

@@ -108,8 +108,8 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     var nodeType = rootElement.getAttribute('data-drag-handler-node-type');
     if (nodeType) {
       if (editorExperiment('platform_editor_controls', 'variant1')) {
-        var _api$core, _api$blockControls2, _rootPos, _rootAnchorName, _rootNodeType;
-        api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.showDragHandleAt(targetPos, anchorName, nodeType, undefined, (_rootPos = rootPos) !== null && _rootPos !== void 0 ? _rootPos : targetPos, (_rootAnchorName = rootAnchorName) !== null && _rootAnchorName !== void 0 ? _rootAnchorName : anchorName, (_rootNodeType = rootNodeType) !== null && _rootNodeType !== void 0 ? _rootNodeType : nodeType));
+        var _api$core, _api$blockControls2;
+        api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.showDragHandleAt(targetPos, anchorName, nodeType, undefined, rootPos !== null && rootPos !== void 0 ? rootPos : targetPos, rootAnchorName !== null && rootAnchorName !== void 0 ? rootAnchorName : anchorName, rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType));
       } else {
         var _api$core2, _api$blockControls3;
         api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.showDragHandleAt(targetPos, anchorName, nodeType));

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

@@ -1,6 +1,5 @@
 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';
@@ -25,7 +24,7 @@ export var removeFromSource = function removeFromSource(tr, $from, to) {
 
       // Currently, we assume that the MIN_LAYOUT_COLUMN is set to 2.
       // This value may require an update when we introduce support for a single-column layout.
-      if (sourceParent.childCount === 2 && fg('platform_editor_advanced_layouts_dnd_remove_layout')) {
+      if (sourceParent.childCount === 2) {
         var _$from$parent$lastChi, _$from$parent$firstCh;
         var layoutContentFragment = $from.parentOffset === 0 ? Fragment.from((_$from$parent$lastChi = $from.parent.lastChild) === null || _$from$parent$lastChi === void 0 ? void 0 : _$from$parent$lastChi.content) : Fragment.from((_$from$parent$firstCh = $from.parent.firstChild) === null || _$from$parent$firstCh === void 0 ? void 0 : _$from$parent$firstCh.content);
         var parent = findParentNodeClosestToPos($from, function (node) {

package/dist/esm/ui/drag-handle.js

@@ -469,7 +469,7 @@ export var DragHandle = function DragHandle(_ref) {
     var supportsAnchor = CSS.supports('top', "anchor(".concat(anchorName, " start)")) && CSS.supports('left', "anchor(".concat(anchorName, " start)"));
     var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
     var hasResizer = nodeType === 'table' || nodeType === 'mediaSingle';
-    var isExtension = nodeType === 'extension' || nodeType === 'bodiedExtension';
+    var isExtension = nodeType === 'extension' || nodeType === 'bodiedExtension' || nodeType === 'multiBodiedExtension' && fg('platform_editor_multi_body_extension_extensibility');
     var isBlockCard = nodeType === 'blockCard' && !!blockCardWidth;
     var isEmbedCard = nodeType === 'embedCard';
     var isMacroInteractionUpdates = macroInteractionUpdates && isExtension;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.5.2",
+	"version": "3.5.3",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -53,7 +53,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.0.0",
 		"@atlaskit/primitives": "^14.2.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.2.0",
+		"@atlaskit/tmp-editor-statsig": "^4.4.0",
 		"@atlaskit/tokens": "^4.5.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -123,9 +123,6 @@
 		"platform_editor_use_nested_table_pm_nodes": {
 			"type": "boolean"
 		},
-		"platform_editor_advanced_layouts_dnd_remove_layout": {
-			"type": "boolean"
-		},
 		"platform_editor_dnd_update_drag_start_target": {
 			"type": "boolean"
 		},
@@ -135,9 +132,6 @@
 		"platform_editor_advanced_layouts_accessibility": {
 			"type": "boolean"
 		},
-		"platform_editor_advanced_layouts_a11y": {
-			"type": "boolean"
-		},
 		"platform_editor_track_node_types": {
 			"type": "boolean"
 		},
@@ -167,6 +161,9 @@
 		},
 		"platform_editor_elements_dnd_multi_select_patch_2": {
 			"type": "boolean"
+		},
+		"platform_editor_multi_body_extension_extensibility": {
+			"type": "boolean"
 		}
 	}
 }