@atlaskit/editor-plugin-block-controls 7.5.1 → 7.5.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.5.3
+
+### Patch Changes
+
+- [`3b9ebe635ab0a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3b9ebe635ab0a) -
+  Cleanup of platform_editor_draghandle_safari_scroll_fix
+
+## 7.5.2
+
+### Patch Changes
+
+- [`75b45f2248329`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/75b45f2248329) -
+  FG cleanup platform_editor_elements_dnd_multi_select_patch_2
+- Updated dependencies
+
 ## 7.5.1
 
 ### Patch Changes

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

@@ -260,13 +260,10 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
       }
       var nodeType = (_state$doc$nodeAt = state.doc.nodeAt(currentNodePos)) === null || _state$doc$nodeAt === void 0 ? void 0 : _state$doc$nodeAt.type.name;
       var shouldMoveNode = false;
-      if (moveToPos > -1 && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_2')) {
+      if (moveToPos > -1) {
         var isDestDepthSameAsSource = $currentNodePos.depth === state.doc.resolve(moveToPos).depth;
         var isSourceLayoutColumn = nodeType === 'layoutColumn';
         shouldMoveNode = isDestDepthSameAsSource || isSourceLayoutColumn;
-      } else {
-        // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
-        shouldMoveNode = moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn';
       }
       var _expandSelectionBound = (0, _selection.expandSelectionBounds)($currentNodePos, selection.$to),
         $newAnchor = _expandSelectionBound.$anchor,
@@ -318,7 +315,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
     return function (_ref7) {
       var _api$blockControls$co, _api$accessibilityUti;
       var tr = _ref7.tr;
-      if (!api || (start < 0 || to < 0) && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_2')) {
+      if (!api || start < 0 || to < 0) {
         return tr;
       }
       var handleNode = tr.doc.nodeAt(start);

package/dist/cjs/editor-commands/move-to-layout.js

@@ -321,7 +321,7 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
       }
 
       // we don't want to remove marks when moving/re-ordering layoutSection
-      var shouldRemoveMarks = !($sourceFrom.node().type === layoutSection && (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true) && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_3'));
+      var shouldRemoveMarks = !($sourceFrom.node().type === layoutSection && (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true));
       var fromContentBeforeBreakoutMarksRemoved = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true) ? tr.doc.slice($sourceFrom.pos, sourceTo).content : $sourceFrom.nodeAfter;
 
       // remove breakout from source content

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

@@ -441,20 +441,6 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     });
     view.focus();
   }, [isMultiSelect, api, view, dragHandleSelected, getPos, isTopLevelNode, nodeType, anchorName]);
-
-  // TODO: ED-26959 - This needs to be investigated further. Drag preview generation is not always working
-  // as expected with a node selection. This workaround sets the selection to the node on mouseDown,
-  // but ensures the preview is generated correctly.
-  var handleMouseDown = (0, _react.useCallback)(function () {
-    if ((0, _experiments.editorExperiment)('advanced_layouts', true) && !(0, _platformFeatureFlags.fg)('platform_editor_draghandle_safari_scroll_fix')) {
-      var _buttonRef$current;
-      // prevent native drag and drop.
-      (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
-      if (!isLayoutColumn) {
-        return undefined;
-      }
-    }
-  }, [isLayoutColumn]);
   var handleKeyDown = (0, _react.useCallback)(function (e) {
     // allow user to use spacebar to select the node
     if (!e.repeat && e.key === ' ') {
@@ -847,8 +833,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   (0, _react.useEffect)(function () {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current) {
       var id = requestAnimationFrame(function () {
-        var _buttonRef$current2;
-        (_buttonRef$current2 = buttonRef.current) === null || _buttonRef$current2 === void 0 || _buttonRef$current2.focus();
+        var _buttonRef$current;
+        (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
       });
       return function () {
         cancelAnimationFrame(id);
@@ -972,7 +958,6 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         ,
         style: !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? (0, _experiments.editorExperiment)('platform_editor_block_control_optimise_render', true) ? positionStyles : positionStylesOld : {},
         onClick: handleOnClick,
-        onMouseDown: handleMouseDown,
         onKeyDown: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? handleKeyDownNew : handleKeyDown
         // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop
         ,

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

@@ -260,13 +260,10 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
       }
       const nodeType = (_state$doc$nodeAt = state.doc.nodeAt(currentNodePos)) === null || _state$doc$nodeAt === void 0 ? void 0 : _state$doc$nodeAt.type.name;
       let shouldMoveNode = false;
-      if (moveToPos > -1 && fg('platform_editor_elements_dnd_multi_select_patch_2')) {
+      if (moveToPos > -1) {
         const isDestDepthSameAsSource = $currentNodePos.depth === state.doc.resolve(moveToPos).depth;
         const isSourceLayoutColumn = nodeType === 'layoutColumn';
         shouldMoveNode = isDestDepthSameAsSource || isSourceLayoutColumn;
-      } else {
-        // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
-        shouldMoveNode = moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn';
       }
       const {
         $anchor: $newAnchor,
@@ -319,7 +316,7 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
   tr
 }) => {
   var _api$blockControls$co2, _api$accessibilityUti;
-  if (!api || (start < 0 || to < 0) && fg('platform_editor_elements_dnd_multi_select_patch_2')) {
+  if (!api || start < 0 || to < 0) {
     return tr;
   }
   const handleNode = tr.doc.nodeAt(start);

package/dist/es2019/editor-commands/move-to-layout.js

@@ -308,7 +308,7 @@ export const moveToLayout = api => (from, to, options) => ({
   }
 
   // we don't want to remove marks when moving/re-ordering layoutSection
-  const shouldRemoveMarks = !($sourceFrom.node().type === layoutSection && editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) && fg('platform_editor_elements_dnd_multi_select_patch_3'));
+  const shouldRemoveMarks = !($sourceFrom.node().type === layoutSection && editorExperiment('platform_editor_element_drag_and_drop_multiselect', true));
   const fromContentBeforeBreakoutMarksRemoved = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) ? tr.doc.slice($sourceFrom.pos, sourceTo).content : $sourceFrom.nodeAfter;
 
   // remove breakout from source content

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

@@ -418,20 +418,6 @@ export const DragHandle = ({
     });
     view.focus();
   }, [isMultiSelect, api, view, dragHandleSelected, getPos, isTopLevelNode, nodeType, anchorName]);
-
-  // TODO: ED-26959 - This needs to be investigated further. Drag preview generation is not always working
-  // as expected with a node selection. This workaround sets the selection to the node on mouseDown,
-  // but ensures the preview is generated correctly.
-  const handleMouseDown = useCallback(() => {
-    if (editorExperiment('advanced_layouts', true) && !fg('platform_editor_draghandle_safari_scroll_fix')) {
-      var _buttonRef$current;
-      // prevent native drag and drop.
-      (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
-      if (!isLayoutColumn) {
-        return undefined;
-      }
-    }
-  }, [isLayoutColumn]);
   const handleKeyDown = useCallback(e => {
     // allow user to use spacebar to select the node
     if (!e.repeat && e.key === ' ') {
@@ -833,8 +819,8 @@ export const DragHandle = ({
   useEffect(() => {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current) {
       const id = requestAnimationFrame(() => {
-        var _buttonRef$current2;
-        (_buttonRef$current2 = buttonRef.current) === null || _buttonRef$current2 === void 0 ? void 0 : _buttonRef$current2.focus();
+        var _buttonRef$current;
+        (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
       });
       return () => {
         cancelAnimationFrame(id);
@@ -957,7 +943,6 @@ export const DragHandle = ({
     ,
     style: !editorExperiment('platform_editor_controls', 'variant1') ? editorExperiment('platform_editor_block_control_optimise_render', true) ? positionStyles : positionStylesOld : {},
     onClick: handleOnClick,
-    onMouseDown: handleMouseDown,
     onKeyDown: expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) && expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? handleKeyDownNew : handleKeyDown
     // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop
     ,

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

@@ -254,13 +254,10 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
       }
       var nodeType = (_state$doc$nodeAt = state.doc.nodeAt(currentNodePos)) === null || _state$doc$nodeAt === void 0 ? void 0 : _state$doc$nodeAt.type.name;
       var shouldMoveNode = false;
-      if (moveToPos > -1 && fg('platform_editor_elements_dnd_multi_select_patch_2')) {
+      if (moveToPos > -1) {
         var isDestDepthSameAsSource = $currentNodePos.depth === state.doc.resolve(moveToPos).depth;
         var isSourceLayoutColumn = nodeType === 'layoutColumn';
         shouldMoveNode = isDestDepthSameAsSource || isSourceLayoutColumn;
-      } else {
-        // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
-        shouldMoveNode = moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn';
       }
       var _expandSelectionBound = expandSelectionBounds($currentNodePos, selection.$to),
         $newAnchor = _expandSelectionBound.$anchor,
@@ -312,7 +309,7 @@ export var moveNode = function moveNode(api) {
     return function (_ref7) {
       var _api$blockControls$co, _api$accessibilityUti;
       var tr = _ref7.tr;
-      if (!api || (start < 0 || to < 0) && fg('platform_editor_elements_dnd_multi_select_patch_2')) {
+      if (!api || start < 0 || to < 0) {
         return tr;
       }
       var handleNode = tr.doc.nodeAt(start);

package/dist/esm/editor-commands/move-to-layout.js

@@ -315,7 +315,7 @@ export var moveToLayout = function moveToLayout(api) {
       }
 
       // we don't want to remove marks when moving/re-ordering layoutSection
-      var shouldRemoveMarks = !($sourceFrom.node().type === layoutSection && editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) && fg('platform_editor_elements_dnd_multi_select_patch_3'));
+      var shouldRemoveMarks = !($sourceFrom.node().type === layoutSection && editorExperiment('platform_editor_element_drag_and_drop_multiselect', true));
       var fromContentBeforeBreakoutMarksRemoved = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) ? tr.doc.slice($sourceFrom.pos, sourceTo).content : $sourceFrom.nodeAfter;
 
       // remove breakout from source content

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

@@ -438,20 +438,6 @@ export var DragHandle = function DragHandle(_ref) {
     });
     view.focus();
   }, [isMultiSelect, api, view, dragHandleSelected, getPos, isTopLevelNode, nodeType, anchorName]);
-
-  // TODO: ED-26959 - This needs to be investigated further. Drag preview generation is not always working
-  // as expected with a node selection. This workaround sets the selection to the node on mouseDown,
-  // but ensures the preview is generated correctly.
-  var handleMouseDown = useCallback(function () {
-    if (editorExperiment('advanced_layouts', true) && !fg('platform_editor_draghandle_safari_scroll_fix')) {
-      var _buttonRef$current;
-      // prevent native drag and drop.
-      (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
-      if (!isLayoutColumn) {
-        return undefined;
-      }
-    }
-  }, [isLayoutColumn]);
   var handleKeyDown = useCallback(function (e) {
     // allow user to use spacebar to select the node
     if (!e.repeat && e.key === ' ') {
@@ -844,8 +830,8 @@ export var DragHandle = function DragHandle(_ref) {
   useEffect(function () {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current) {
       var id = requestAnimationFrame(function () {
-        var _buttonRef$current2;
-        (_buttonRef$current2 = buttonRef.current) === null || _buttonRef$current2 === void 0 || _buttonRef$current2.focus();
+        var _buttonRef$current;
+        (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
       });
       return function () {
         cancelAnimationFrame(id);
@@ -969,7 +955,6 @@ export var DragHandle = function DragHandle(_ref) {
         ,
         style: !editorExperiment('platform_editor_controls', 'variant1') ? editorExperiment('platform_editor_block_control_optimise_render', true) ? positionStyles : positionStylesOld : {},
         onClick: handleOnClick,
-        onMouseDown: handleMouseDown,
         onKeyDown: expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) && expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? handleKeyDownNew : handleKeyDown
         // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop
         ,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "7.5.1",
+	"version": "7.5.3",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 		"@atlaskit/editor-plugin-editor-disabled": "^6.1.0",
 		"@atlaskit/editor-plugin-feature-flags": "^5.0.0",
 		"@atlaskit/editor-plugin-interaction": "^9.0.0",
-		"@atlaskit/editor-plugin-limited-mode": "^3.0.0",
+		"@atlaskit/editor-plugin-limited-mode": "^3.1.0",
 		"@atlaskit/editor-plugin-metrics": "^7.1.0",
 		"@atlaskit/editor-plugin-quick-insert": "^6.0.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
@@ -51,11 +51,11 @@
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
-		"@atlaskit/primitives": "^16.0.0",
+		"@atlaskit/primitives": "^16.1.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.18.0",
-		"@atlaskit/tokens": "^7.0.0",
-		"@atlaskit/tooltip": "^20.6.0",
+		"@atlaskit/tmp-editor-statsig": "^13.27.0",
+		"@atlaskit/tokens": "^7.1.0",
+		"@atlaskit/tooltip": "^20.7.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.18.0",
+		"@atlaskit/editor-common": "^110.22.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -124,15 +124,9 @@
 		"platform_editor_ease_of_use_metrics": {
 			"type": "boolean"
 		},
-		"platform_editor_elements_dnd_multi_select_patch_2": {
-			"type": "boolean"
-		},
 		"platform_editor_multi_body_extension_extensibility": {
 			"type": "boolean"
 		},
-		"platform_editor_elements_dnd_multi_select_patch_3": {
-			"type": "boolean"
-		},
 		"platform_editor_drag_and_drop_perf_analytics": {
 			"type": "boolean"
 		},
@@ -154,9 +148,6 @@
 		"platform_editor_breakout_resizing_widget_fix": {
 			"type": "boolean"
 		},
-		"platform_editor_draghandle_safari_scroll_fix": {
-			"type": "boolean"
-		},
 		"platform_editor_content_mode_button_mvp": {
 			"type": "boolean"
 		},